Commit Graph

27495 Commits

Author SHA1 Message Date
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
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
Anton Hansson
96bc306bdb Merge "Add module_lib and system-server artifacts to sdk dist" 2020-03-25 15:56:51 +00:00
Treehugger Robot
311a6fe3ff Merge "Revert "header-checker: Remove aosp_{arm64,x86}_ab"" 2020-03-25 09:49:42 +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
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
Hsin-Yi Chen
f9e7b620ff Store the sdump path for each type definition when linking ABI dumps
This commit adds sdump paths to ModuleIR::odr_list_map_. It maps type ID
to list of TypeDefinitions. A TypeDefinition consists of a TypeIR and
the sdump path where the type is defined. The path is used to
distinguish the definitions of the type in different source files.

When header-abi-linker merges modules, the compilation unit paths are
copied to the merged module. Thus, the paths are not lost when the
merged module is merged to another one.

Test: ./test.py
Bug: 147396457
Change-Id: I72a9502b4e81f8ead10c8439af76aea86e3bc3f3
2020-03-25 03:55:12 +00:00
Hsin-Yi Chen
4bc670f91d Move the merge functions from IRReader to a new class
This commit refactors the code without changing the functionality.

Test: development/vndk/tools/header-checker/tests/test.py
Bug: 147396457
Change-Id: I0c1ce9d4cf6abd838bbad17149def505c20cedcf
2020-03-25 11:27:34 +08:00
Hsin-Yi Chen
5bc3f39eb5 Add a test case for merging multiple definitions
Test: ./test.py HeaderCheckerTest.test_merge_multi_definitions
Bug: 147396457
Change-Id: I73f12b2db2729e638818fdf7413876a37ce376f1
2020-03-25 11:25:48 +08:00
Logan Chien
f1036391fc header-checker: Remove obsolete merge-abi-diff
This commit removes obsolete merge-abi-diff.  This command hasn't been
used for a while (not referenced by the build system).

Test: OUT_DIR=out \
      development/vndk/tools/header-checker/android/build-prebuilts.sh
Change-Id: I2de5189cca6354183f2bb65f6cc652251a32094b
2020-03-24 13:20:02 -07:00
Treehugger Robot
a449b07824 Merge "Fix the bug that ABI linker loads input files more than once" 2020-03-23 02:57:28 +00:00
Anton Hansson
858113cdae Add module_lib and system-server artifacts to sdk dist
Makes these artifacts available for the update_prebuilts script.

Bug: 149293194
Test: m win_sdk dist && find out/dist -type f
Change-Id: Icd91da0976f24eb1b4ea1eeaebb96398990f760e
Merged-In: Icd91da0976f24eb1b4ea1eeaebb96398990f760e
(cherry picked from commit b4aca10721)
2020-03-20 15:22:23 +00:00
Yabin Cui
850d3a1441 Merge "Switch to clang-r377782c" 2020-03-19 17:41:38 +00:00
Hsin-Yi Chen
5c341964e4 Fix the bug that ABI linker loads input files more than once
Test: development/vndk/tools/header-checker/tests/test.py
Bug: 147396457
Change-Id: I8a6adc4ae5d0a75cbeca3053b5ae9b5b0e997d7a
2020-03-19 12:49:36 +08:00
Yabin Cui
cf892fc776 Switch to clang-r377782c
Bug: 149849077
Test: run build-prebuilts.sh.
Change-Id: I394897b515cb8cd968671e8e48e198c49038d01c
2020-03-18 19:50:33 -07:00
David Gross
6e9e6a6c28 Merge "For darwin, add lib64/libc++abi.1.dylib." 2020-03-17 22:44:31 +00:00
David Gross
460d56ddd1 For darwin, add lib64/libc++abi.1.dylib.
libc++.1.dylib, which was already added, depends on this.

Bug: 148267171
Bug: 142590626
Bug: 144040336
Test: N/A
Merged-In: Ifd5b2db7b18a29c1b58b408118951792733649b7
Change-Id: Ifd5b2db7b18a29c1b58b408118951792733649b7
(cherry picked from commit f879b7a53c)
2020-03-17 14:46:21 -07:00
David Gross
325d4d9cd0 Merge "Move lld.exe (windows) and add dependent library libwinpthread-1.dll" 2020-03-17 21:29:53 +00:00
David Gross
a893a3fa39 Move lld.exe (windows) and add dependent library libwinpthread-1.dll
Move lld.exe to lld-bin directory; add lld-bin/libwinpthread-1.dll; add
trampoline.

Best practice is to ship necessary libraries of expected versions along
with build tools, rather than requiring them to be found elsewhere.

lld.exe depends on libwinpthread-1.dll and windows looks for it in the
same directory as lld.exe.  Unfortunately, there's already a 32-bit
libwinpthread-1.dll at the tool root (used by 32-bit executables at
the tool root), and lld.exe is a 64-bit executable, so it needs its own
directory and its own library.

In the old location of lld.exe, we add a trampoline executable (a build
artifact) in lld-bin; this means Gradle, which invokes lld.exe in the old
location, does not have to change.

Bug: 148267171
Bug: 142590626
Bug: 144040336

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

Merged-In: Ice6710ed204a25d09ac596207c02b8b99ca95b8b
Change-Id: Ice6710ed204a25d09ac596207c02b8b99ca95b8b
(cherry picked from commit 24e52959d7)
2020-03-17 13:45:39 -07:00
David Gross
8d6036e90e Merge "Move lld (darwin, linux) and add dependent libraries" 2020-03-17 20:10:13 +00:00
David Gross
47225775d9 Move lld (darwin, linux) and add dependent libraries
darwin: Move lld to lld-bin directory; add lib64/libc++.1.dylib; add trampoline

linux: Move lld to lld-bin directory; add lib64/libc++.so.1; add trampoline

Best practice is to ship necessary libraries of expected versions along
with build tools, rather than requiring them to be found elsewhere.

lld depends on libc++.1.dylib (darwin) or libc++.so.1 (linux) and looks for it
in ../lib64, so we need to move lld to an appropriate relative location.
In the old location of lld, we add a simple bash trampoline to invoke
lld in lld-bin; this means Gradle, which invokes lld in the old
location, does not have to change.

Bug: 148267171
Bug: 142590626
Bug: 144040336

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
Merged-In: I69b4ef79208bd7d06a377c0761671f1b572abced
Change-Id: I69b4ef79208bd7d06a377c0761671f1b572abced
(cherry picked from commit e9351e5061)
2020-03-17 19:07:12 +00:00
Treehugger Robot
73870d9f09 Merge "Move to framework-doc-stubs module for versions xml and annotations" 2020-03-13 02:13:59 +00:00
Aurimas Liutikas
1a6d508576 Move to framework-doc-stubs module for versions xml and annotations
api-versions.xml and annotations.zip will now be taken from framework-doc-stubs
module so that api-stubs-docs can stop generating them.

Test: lunch sdk; make sdk
Change-Id: I35fdba553318098a09249f47d7d78cdef79f3898
2020-03-12 16:26:06 -07:00
Oliver Nguyen
834c8442cb Merge "Update acov script to handle new coverage file locations." 2020-03-12 17:43:09 +00:00
Oliver Nguyen
f7421ae9db Update acov script to handle new coverage file locations.
Test: Build with native coverage and run acov, check report contents.
Change-Id: I47afd35216cfcc7df7da2378cccdf8dba23bd8e2
2020-03-11 10:54:07 -07:00
Bill Yi
d8af24477c Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" 2020-03-05 18:27:29 +00:00
Bill Yi
3010e76b9b Merge stage-aosp-master to aosp-master - DO NOT MERGE
Change-Id: I389e3de0857445fe25bbfb26844d31d1f64f3819
2020-03-05 09:50:57 -08:00
Automerger Merge Worker
b6b64e7adb Merge "Label libandroid_runtime_lazy.so as LLNDK-private" am: bbc0eb847a
Change-Id: I274b8b7f18dfff81b54a62707e494c515da86b16
2020-03-04 09:27:10 +00:00
Treehugger Robot
bbc0eb847a Merge "Label libandroid_runtime_lazy.so as LLNDK-private" 2020-03-04 09:08:20 +00:00
Hsin-Yi Chen
65ee0b5747 Label libandroid_runtime_lazy.so as LLNDK-private
libbinder_ndk and libmediandk depend on libandroid_runtime_lazy.

Bug: 150740437
Test: vts_vndk_open_libraries_test
Change-Id: I199930482813ed48a9c2318715edd260f89bcbab
2020-03-04 12:49:04 +08:00
Automerger Merge Worker
4170e08b10 Merge "Increment platform-tools version to 30.0.0." am: ff0896cef2
Change-Id: I3d461525d8d89a354392e047f7668df7198e028c
2020-03-03 00:13:27 +00:00
Josh Gao
ff0896cef2 Merge "Increment platform-tools version to 30.0.0." 2020-03-03 00:01:43 +00:00
Josh Gao
d4076c2d58 Increment platform-tools version to 30.0.0.
Bug: http://b/150296491
Test: none
Change-Id: I4b27c83aada5dd8ce5fa1948bb84212f54288ec7
2020-03-02 14:09:54 -08:00
Automerger Merge Worker
f94546de92 Merge "Adds official comment support to the whitelist format." am: e999df1b2a
Change-Id: If8c72d3b0b428cfbf77adc3feedf988695956c7d
2020-03-02 18:44:12 +00:00
Daniel Norman
e999df1b2a Merge "Adds official comment support to the whitelist format." 2020-03-02 18:31:56 +00:00
Automerger Merge Worker
811bcd1b86 Merge changes Ide2ae854,I71ca710e,I90a80a7a,I05e82f06 am: e0505bfec4
Change-Id: I24d6d94b148b5f5a38c3251209e1a6ee1183766d
2020-03-02 10:14:11 +00:00
Automerger Merge Worker
59e0bcd942 gsi-pubsign-release.sh print verbose log am: f2c04ff675
Change-Id: I5a85d773343f7abbdc70968c0f691a3bddfed482
2020-03-02 10:14:09 +00:00
Automerger Merge Worker
a431778ce9 Fix gsi-pubsign-release.sh rsync command am: 7d0189a6ec
Change-Id: If41a1eba6271f0673f97bf4db63d60caec11d276
2020-03-02 10:14:07 +00:00
Automerger Merge Worker
e44709edfc Add script for gsi_pubsign build chaining target am: 12d2ae00ea
Change-Id: I58459649e94fdbe473f5ba74c6db8b8f3f45913f
2020-03-02 10:14:05 +00:00
Treehugger Robot
e0505bfec4 Merge changes Ide2ae854,I71ca710e,I90a80a7a,I05e82f06
* changes:
  gsi-pubsign-release.sh follows symbolic link
  gsi-pubsign-release.sh print verbose log
  Fix gsi-pubsign-release.sh rsync command
  Add script for gsi_pubsign build chaining target
2020-03-02 05:52:16 +00:00
Automerger Merge Worker
c0fb152741 Merge "Remove embedded launcher from repack_super_image" am: b2149885b0
Change-Id: Ibbf4cf81e94a00dc5618f64cc62fd030875fcfc9
2020-03-02 04:34:17 +00:00
Treehugger Robot
b2149885b0 Merge "Remove embedded launcher from repack_super_image" 2020-03-02 04:19:34 +00:00
Yo Chiang
5b8373d7b9 gsi-pubsign-release.sh follows symbolic link
Use `find -L` and `cp --dereference` to follow symlinks.

Bug: 149803895
Test: manual
Merged-In: Ide2ae854dd61e595ca2676634f660241343e6dba
Change-Id: Ide2ae854dd61e595ca2676634f660241343e6dba
(cherry picked from commit abdcbb3f83)
2020-03-02 02:47:22 +00:00
Yo Chiang
f2c04ff675 gsi-pubsign-release.sh print verbose log
Bug: 149803895
Test: ./gsi-pubsign-release.sh aosp_arm64 aosp_arm64_pubsign \
        aosp_arm64-artifact_path aosp_arm64_pubsign-artifact_path
Merged-In: I71ca710e3d2d7305112e118e8d19c3b07d6f028c
Change-Id: I71ca710e3d2d7305112e118e8d19c3b07d6f028c
(cherry picked from commit fe9bb151c0)
2020-03-02 02:47:14 +00:00
Yo Chiang
7d0189a6ec Fix gsi-pubsign-release.sh rsync command
Add trailing / to rsync source directory, this prevents rsync from
creating an additional level of directory under the destination.

For example, if `tree src` outputs:
  src
  └── file

then:
$ rsync src dest   # creates dest/src/file
$ rsync src/ dest  # creates dest/file

Bug: 149803895
Test: ./gsi-pubsign-release.sh aosp_arm64 aosp_arm64_pubsign \
        aosp_arm64-artifact_path aosp_arm64_pubsign-artifact_path

Merged-In: I90a80a7afdf6f71db592599c6a645554cf830309
Change-Id: I90a80a7afdf6f71db592599c6a645554cf830309
(cherry picked from commit 8b15a8ba3c)
2020-03-02 02:45:45 +00:00
Yo Chiang
12d2ae00ea Add script for gsi_pubsign build chaining target
Bug: 149803895
Test: ./gsi-pubsign-release.sh aosp_arm64 aosp_arm64_pubsign \
        aosp_arm64-artifact_path aosp_arm64_pubsign-artifact_path

Merged-In: I05e82f0605eec33c0da9b5a5d5cbf3506af3706c
Change-Id: I05e82f0605eec33c0da9b5a5d5cbf3506af3706c
(cherry picked from commit 45c81a65e7)
2020-03-02 10:38:54 +08:00