Commit Graph

27552 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
9ce531b6d9 Merge "Fix the bug that ABI linker loads input files more than once" am: a449b07824
Change-Id: Id4a4fb1613649d0690958893e9324d0e46df9bc1
2020-03-23 03:17:47 +00: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
93d26da4f3 Merge "Switch to clang-r377782c" am: 850d3a1441
Change-Id: I1a83ee2a65ff24914711c422ed322af88a883ada
2020-03-19 17:59:25 +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
Xin Li
2156f9c05c DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master
Bug: 151763422
Change-Id: If3a10c67faf600c099b6b92ae0d9508d4687da58
2020-03-18 19:40:28 -07:00
David Gross
00e33542ac Merge "For darwin, add lib64/libc++abi.1.dylib." am: 6e9e6a6c28
Change-Id: Ic7a054586bb78ef825d3342a66d75f85ecbd7d7d
2020-03-17 22:59:21 +00: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
dea8d5e619 Merge "Move lld.exe (windows) and add dependent library libwinpthread-1.dll" am: 325d4d9cd0
Change-Id: I7e9b1ac2bffd10ce0c42a6e3c707eb75ed7825e4
2020-03-17 21:45:53 +00: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
0bb3732605 Merge "Move lld (darwin, linux) and add dependent libraries" am: 8d6036e90e
Change-Id: I463f6122a0bde7eebdd93a4fa23823e873bd4e46
2020-03-17 20:23:54 +00: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
Automerger Merge Worker
ad5aaf6752 Merge "Move to framework-doc-stubs module for versions xml and annotations" am: 73870d9f09 am: 50ba681dc1
Change-Id: I72dfc0184585e27d06cb66a70a16c20c7e36f2bd
2020-03-13 02:44:33 +00:00
Automerger Merge Worker
50ba681dc1 Merge "Move to framework-doc-stubs module for versions xml and annotations" am: 73870d9f09
Change-Id: Iada2c3022bde0fc126f47b3875dd2abdf16fcc92
2020-03-13 02:27:27 +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
Automerger Merge Worker
309b92f831 For darwin, add lib64/libc++abi.1.dylib. am: 6f16baeea9 am: 6a35354abd
Change-Id: Ie19c3290fd1a421c97c4b61c33af7095485d3888
2020-03-12 20:31:22 +00:00
Automerger Merge Worker
6a35354abd For darwin, add lib64/libc++abi.1.dylib. am: 6f16baeea9
Change-Id: I80cd25c48793a0f34db97b93a3da76d8a9fb12f8
2020-03-12 20:18:10 +00:00
Automerger Merge Worker
9dc2cbd17d Merge "Update acov script to handle new coverage file locations." am: 834c8442cb am: 0b6aee253a
Change-Id: I308605b471bbcaa347acad3e9cbb607f525621c7
2020-03-12 18:24:12 +00:00
Automerger Merge Worker
5c070e9271 Move lld.exe (windows) and add dependent library libwinpthread-1.dll am: 7fe8024a20 am: c41cd4595c
Change-Id: I3f978ace55a85e9e959838e15ce372d9dce45b45
2020-03-12 18:09:48 +00:00
Automerger Merge Worker
0b6aee253a Merge "Update acov script to handle new coverage file locations." am: 834c8442cb
Change-Id: Ib845c0ad109545d97c3a6b24e5c73398a900af93
2020-03-12 18:05:23 +00:00
Automerger Merge Worker
c41cd4595c Move lld.exe (windows) and add dependent library libwinpthread-1.dll am: 7fe8024a20
Change-Id: I3e33565905031fe25495dc93dce02da60c376af6
2020-03-12 17:53:10 +00:00
Oliver Nguyen
834c8442cb Merge "Update acov script to handle new coverage file locations." 2020-03-12 17:43:09 +00:00
David Gross
6f16baeea9 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-12 16:53:46 +00:00
Automerger Merge Worker
b3b603e614 Move lld (darwin, linux) and add dependent libraries am: e3e67a8212 am: 1578f6602b
Change-Id: I9f74855b4e71ae8bc246fa57637a3ff1dcd871e2
2020-03-11 20:17:21 +00:00