Commit Graph

27593 Commits

Author SHA1 Message Date
Xin Li
79d535fafe DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
Bug: 151763422
Change-Id: I1c095258d6927a192abfc7f78eef050bb29312d6
2020-04-09 17:50:11 -07:00
Chih-hung Hsieh
ea567299f0 Merge "Accept multiple --crate-type and fix for new cargo." am: 8833757764 am: c81d221b0c
Change-Id: Ic53965e38b87660382d281c20c2bc6feb0da8a22
2020-04-07 19:40:26 +00:00
Chih-hung Hsieh
c81d221b0c Merge "Accept multiple --crate-type and fix for new cargo." am: 8833757764
Change-Id: Ie12156effc31e36f73f7c5230fa89a40a6509b2e
2020-04-07 19:28:22 +00:00
Chih-hung Hsieh
8833757764 Merge "Accept multiple --crate-type and fix for new cargo." 2020-04-07 19:17:00 +00:00
Chih-Hung Hsieh
8a1a2300ed Accept multiple --crate-type and fix for new cargo.
* Change crate_type string to crate_types list.
  In dump_android_module, iterate over crate_types and
  call dump_one_android_module for each crate type.
* In decide_one_module_type, add mapping of Rust crate types:
        lib => rlib         (no change)
        rlib => rlib        (new)
        dylib => dylib      (new)
        cdylib => shared    (changed)
        staticlib => static (new)
  Maybe we should change and map 'lib' to 'lib',
  but before that, crate_types should not contain
  both 'lib' and 'rlib'.
* Accept new cargo output format, which can
  call rustc with the main source file name after
  other flags, not always after the "--crate-name" flag.
* Work around duplicated test module name problem;
  call self.runner.claim_module_name for every named test module.

Bug: 153118477
Test: fetch quiche-0.3.0, bindgen-0.53.2 and other Rust crates
Test: cargo2android.py --run --vv --device --tests
Change-Id: Id65c3929b5c593df73f26f1510ad7e89194b209e
2020-04-07 10:49:08 -07:00
Bo Hu
1daa3df3d5 Merge "emulator: package ramdisk-qemu.img to image zip" am: 62b3edb5ea am: 59578569d4
Change-Id: I7da698060d12b9b098ccac64a52707583201a7ca
2020-04-06 19:53:23 +00:00
Bo Hu
59578569d4 Merge "emulator: package ramdisk-qemu.img to image zip" am: 62b3edb5ea
Change-Id: I22b9612eda9510222824c5da6722ef5ce71ea9e7
2020-04-06 19:31:57 +00:00
Bo Hu
62b3edb5ea Merge "emulator: package ramdisk-qemu.img to image zip" 2020-04-06 19:18:13 +00:00
bohu
7b21036ee9 emulator: package ramdisk-qemu.img to image zip
BUG: 149826779
Test: build
Change-Id: I7949daa15edafeeb51e80d320bcbb5a450cd0a49
2020-04-06 14:05:54 +00:00
David Gross
e65e153862 Merge "Remove old GNU linkers from SDK." am: 897d8958c6 am: 0751c0acda
Change-Id: I864c64d4fee8c381b26bfa253707b52acea5a03f
2020-04-03 18:10:11 +00:00
David Gross
0751c0acda Merge "Remove old GNU linkers from SDK." am: 897d8958c6
Change-Id: Ib1e5ddc1e141b8c583b406194221d51b2b032313
2020-04-03 17:49:19 +00:00
David Gross
897d8958c6 Merge "Remove old GNU linkers from SDK." 2020-04-03 17:27:36 +00:00
David Gross
058dd79b80 Remove old GNU linkers from SDK.
Linkers aarch64-linux-android-ld and x86_64-linux-android-ld were built
with a minimum macOS deployment target lower than 10.9, so they cannot
be signed and notarized.  Rather than try to produce newer versions of
these linkers (which are obsolete in the SDK anyway), we remove them (so
that all of the SDK can be signed and notarized).  Rather than introduce
an inconsistency among the linkers for a particular host (there are
three other GNU linkers that don't have this problem) or across hosts
(there are no issues on linux or windows), we remove all of the GNU
linkers, not just the two problematic ones.

Only newer gradle plugins (those that look for the clang linker lld)
will work with the new SDK from which those old linkers have been
removed.

Bug: 152337684

Test: (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
      (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug win_sdk dist sdk_repo
      Inspect sdk-repo-{linux,windows}-build-tools-eng.*.zip
Merged-In: Iccfa870a826de3f12c99175e0761ea00fe2876ed
Change-Id: Iccfa870a826de3f12c99175e0761ea00fe2876ed
(cherry picked from commit cb255acf77)
2020-04-02 15:42:50 -07:00
Treehugger Robot
d09dbef98f Merge "Skip yanked packages and use newest version number." am: f50e489c40 am: 42a7aeb008
Change-Id: I3892e40e6dab66888854a7ebc6ceb719846d1645
2020-04-02 21:59:18 +00:00
Treehugger Robot
42a7aeb008 Merge "Skip yanked packages and use newest version number." am: f50e489c40
Change-Id: Ie3e866d3e00d5ad06fb467b3ba549b4708009bc0
2020-04-02 21:36:59 +00:00
Treehugger Robot
f50e489c40 Merge "Skip yanked packages and use newest version number." 2020-04-02 21:15:52 +00:00
Chih-Hung Hsieh
7c6362a96b Skip yanked packages and use newest version number.
* crates.io keeps yanked packages with the "yanked" attribute.
  For example, log-0.4.9 and log-0.4.10 were yanked so
  "get_rust_pkg log" should skip them.
* Compare version numbers before the publish id number.
  For example, lazy_static-1.1.1 was published after lazy_static-1.4.0,
  but "get_rust_pkg lazy_static" should fetch 1.4.0.

Test: get_rust_pkg.py -v log  # get log.0.4.8
Test: get_rust_pkg.py -v log-0.4.10  # get log.0.4.10
Test: get_rust_pkg.py -v lazy_static  # get lazy_static-1.4.0
Change-Id: Id005a91b75c0885285a76136bd6de19d0dafa5c1
2020-04-02 10:23:48 -07:00
Chih-hung Hsieh
1caaa16fa1 Merge "Pass --no-default-features to cargo build" am: ebfb3a9927 am: 7a56a6c23e
Change-Id: I2f572a25d5dc1d2462b64fa59c4fd8dff8606c0f
2020-03-31 19:02:46 +00:00
Chih-hung Hsieh
7a56a6c23e Merge "Pass --no-default-features to cargo build" am: ebfb3a9927
Change-Id: I05fe653337476615b6dbfc1e7870d99756f69e7e
2020-03-31 18:46:57 +00:00
Chih-hung Hsieh
ebfb3a9927 Merge "Pass --no-default-features to cargo build" 2020-03-31 18:33:10 +00:00
Chih-Hung Hsieh
6c8d52f6eb Pass --no-default-features to cargo build
* When --features is specified,
  pass --no-default-features to cargo.
* When a dependent Rust package is imported to AOSP,
  if not all "default" features are needed, run
  cargo2android.py with empty or a list of specific features.

Test: cargo2android.py --run # use default features
Test: cargo2android.py --run --features=''  # no default
Test: cargo2android.py --run --features='default,std'
Change-Id: I854f1ecb7d7466490ff34e229ec14a07c1273c6d
2020-03-31 10:08:06 -07:00
Treehugger Robot
4d47354084 Merge "gsi-pubsign-release.sh: Add copyright notice" am: 1930acb771 am: 5636a51715
Change-Id: I92179df87591dff6053c5e9d098feb34429fa229
2020-03-31 05:47:10 +00:00
Treehugger Robot
5636a51715 Merge "gsi-pubsign-release.sh: Add copyright notice" am: 1930acb771
Change-Id: I0ddbe07b1ccb4d00f16ce7938ab8df4ec9ede75c
2020-03-31 05:30:43 +00:00
Treehugger Robot
1930acb771 Merge "gsi-pubsign-release.sh: Add copyright notice" 2020-03-31 05:15:51 +00:00
Hsin-Yi Chen
baf854fda9 Merge "Create ABI reference dumps for libraries with multiple tags" am: 263ec9ac02 am: 3f8b424b5e
Change-Id: I82faf4125631be5c22b0d608832f2f72bd8987ae
2020-03-31 03:06:27 +00:00
Hsin-Yi Chen
3f8b424b5e Merge "Create ABI reference dumps for libraries with multiple tags" am: 263ec9ac02
Change-Id: I6c90850dac8413b989cc1b56b61e0ae9f1f6dc5a
2020-03-31 02:45:01 +00:00
Hsin-Yi Chen
263ec9ac02 Merge "Create ABI reference dumps for libraries with multiple tags" 2020-03-31 02:33:16 +00:00
Weilun Du
cb3e73d1ca Merge "[SdkSetup] Disable Offload Tethering" am: c3db8555b4 am: 9e6a2bd5ad
Change-Id: I11e9fd36bbc7714babdcc05e6be6fa95f897d889
2020-03-31 02:18:12 +00:00
Weilun Du
9e6a2bd5ad Merge "[SdkSetup] Disable Offload Tethering" am: c3db8555b4
Change-Id: I6456ce046eace6ccd5c3f3f4667ded50275025cc
2020-03-31 02:00:21 +00:00
Weilun Du
c3db8555b4 Merge "[SdkSetup] Disable Offload Tethering" 2020-03-31 01:53:24 +00:00
Weilun Du
c734c3fc01 [SdkSetup] Disable Offload Tethering
Unbreak emulator system crash when WiFi tethering switch is turned
on in Settings app.

BUG: 150408099

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: I893258171c9a6aa4659c8a636f410414c0216d41
2020-03-30 21:17:07 +00:00
Chih-hung Hsieh
97b83bd3a4 Merge "add get_rust_pkg.py" am: e95677343a am: b415c21248
Change-Id: I952821b551d347edd6c5fcc34c43cb411473ccc0
2020-03-30 21:13:31 +00:00
Chih-hung Hsieh
b415c21248 Merge "add get_rust_pkg.py" am: e95677343a
Change-Id: I3c8dc10602b695d674f76e96c24af168fde47d55
2020-03-30 20:45:36 +00:00
Chih-hung Hsieh
e95677343a Merge "add get_rust_pkg.py" 2020-03-30 20:30:23 +00:00
Chih-Hung Hsieh
8a3e910fee add get_rust_pkg.py
Test: get_rust_pkg.py syn
Test: get_rust_pkg.py -v -o /tmp bitflags-1.2.0
Change-Id: I540b757a9dab56d4216015513d649b23063fb901
2020-03-27 12:41:29 -07:00
Hsin-Yi Chen
ae54edc536 Create ABI reference dumps for libraries with multiple tags
A library may have both VNDK variant and stubs. The variants are tagged
with VNDK and PLATFORM in lsdump_paths.txt. create_reference_dumps.py
should generate the ABI dumps for both.

Bug: 152277104
Test: ./create_reference_dumps.py
Test: ./create_reference_dumps.py -libs libselinux
Change-Id: I2ee43d70efcdee43de821c93c31cdb628c36ecb1
2020-03-27 14:12:23 +08:00
Anton Hansson
903743f769 Merge "Add module_lib and system-server artifacts to sdk dist" am: 96bc306bdb am: 59f8d20e9e
Change-Id: I04778ea93eabdbc0594e0bce0ebd2b8a5ab7d02a
2020-03-25 16:30:24 +00:00
Anton Hansson
59f8d20e9e Merge "Add module_lib and system-server artifacts to sdk dist" am: 96bc306bdb
Change-Id: Ief282bd4899698d920f913de0f2d4bdd3d302163
2020-03-25 16:13:38 +00:00
Anton Hansson
96bc306bdb Merge "Add module_lib and system-server artifacts to sdk dist" 2020-03-25 15:56:51 +00:00
Treehugger Robot
a245e0995e Merge "Revert "header-checker: Remove aosp_{arm64,x86}_ab"" am: 311a6fe3ff am: 78c2a3badb
Change-Id: I1847a923740b6a4dca0008c2bd6109caaf106f78
2020-03-25 10:28:21 +00:00
Treehugger Robot
78c2a3badb Merge "Revert "header-checker: Remove aosp_{arm64,x86}_ab"" am: 311a6fe3ff
Change-Id: I91a302c70da2d3b913813add57a0525a2f5e413f
2020-03-25 10:05:23 +00:00
Treehugger Robot
311a6fe3ff Merge "Revert "header-checker: Remove aosp_{arm64,x86}_ab"" 2020-03-25 09:49:42 +00:00
Treehugger Robot
741268271a Merge changes If6b35e94,I72a9502b,I0c1ce9d4,I73f12b2d am: 81bbf7260c am: 1682ce635b
Change-Id: I79dd29815a7c5dcf2e0df37391eed135263edadf
2020-03-25 06:27:55 +00:00
Treehugger Robot
1682ce635b Merge changes If6b35e94,I72a9502b,I0c1ce9d4,I73f12b2d am: 81bbf7260c
Change-Id: I03f89e81c7d4028ac9de7c2b6519b0b83da52cf5
2020-03-25 06:14:38 +00:00
Hsin-Yi Chen
ec315367d5 Revert "header-checker: Remove aosp_{arm64,x86}_ab"
This reverts commit 17ec995b11.

Test: ./create_reference_dumps.py
Bug: 152080301
Reason for revert: aosp_arm_ab and aosp_x86_ab are still supported.

Change-Id: I7a80931e8bc60fc86083d6fc55daa53e3ed9a4db
2020-03-25 06:11:06 +00:00
Treehugger Robot
81bbf7260c Merge changes If6b35e94,I72a9502b,I0c1ce9d4,I73f12b2d
* changes:
  Look up referenced types' compilation unit paths when linking ABI dumps
  Store the sdump path for each type definition when linking ABI dumps
  Move the merge functions from IRReader to a new class
  Add a test case for merging multiple definitions
2020-03-25 05:54:01 +00:00
Logan Chien
5d8dcd9669 Merge "header-checker: Remove obsolete merge-abi-diff" am: 94989c7e00 am: 7d113452d6
Change-Id: I1c98001e4c584111c0920be60e16a6f5e65ed61d
2020-03-25 05:01:03 +00:00
Logan Chien
7d113452d6 Merge "header-checker: Remove obsolete merge-abi-diff" am: 94989c7e00
Change-Id: I7233df0fdc1319dfacaf936dfc5b3b1e2caa519d
2020-03-25 04:42:22 +00:00
Logan Chien
94989c7e00 Merge "header-checker: Remove obsolete merge-abi-diff" 2020-03-25 04:26:45 +00:00
Hsin-Yi Chen
a6bd6ed7bc Look up referenced types' compilation unit paths when linking ABI dumps
When header-abi-linker merges a pointer, reference, array, or qualified
type, it looks up the referenced type's compilation unit path, and uses
the path to distinguish multiple definitions of the type as well as the
types referencing it.

Test: ./test.py
Bug: 147396457
Change-Id: If6b35e941f9aa03616b236289450c9b10062b719
2020-03-25 04:24:48 +00:00