Commit Graph

18381 Commits

Author SHA1 Message Date
Automerger Merge Worker
dcf5cfaea5 Merge "Permissions XML file for java_sdk_library is mutated for APEX" am: 2d6d5d8995
Change-Id: I8bc80e0fb2f21707685ea4ffcd5f26ee58c629db
2020-02-20 00:22:00 +00:00
Jiyong Park
2d6d5d8995 Merge "Permissions XML file for java_sdk_library is mutated for APEX" 2020-02-19 23:57:14 +00:00
Automerger Merge Worker
d65bac5154 Merge "Add CCACHE_DIR to allowed environment variables" am: b34ebcf03b
Change-Id: Iad8f07c6e7c33d23d18a39adc768c8d814346c7a
2020-02-19 22:25:44 +00:00
Automerger Merge Worker
14e3fc1a29 Merge "Port IdentityCredential HAL to AIDL." am: c2937d29a8
Change-Id: Id1059016bc3b9e19ec6e70c28675498185cfddaf
2020-02-19 22:23:13 +00:00
Automerger Merge Worker
b51bc93c26 Merge "Allow java_system_modules_import to replace java_system_modules" am: 1876a76216
Change-Id: I6e092eb8999fbe68d98c3330e96967a3de12e590
2020-02-19 22:22:50 +00:00
Automerger Merge Worker
b8acf86cda Merge "Allow vts config to be packaged in other test suites" am: 24f3c99af8
Change-Id: Id9a1b3b875ddcacc465d854cce08980c05780abe
2020-02-19 22:21:58 +00:00
Treehugger Robot
b34ebcf03b Merge "Add CCACHE_DIR to allowed environment variables" 2020-02-19 21:37:15 +00:00
David Zeuthen
c2937d29a8 Merge "Port IdentityCredential HAL to AIDL." 2020-02-19 21:14:41 +00:00
Treehugger Robot
1876a76216 Merge "Allow java_system_modules_import to replace java_system_modules" 2020-02-19 21:08:57 +00:00
Dan Shi
24f3c99af8 Merge "Allow vts config to be packaged in other test suites" 2020-02-19 21:05:55 +00:00
Paul Duffin
83a2d967de Allow java_system_modules_import to replace java_system_modules
Previously, there were some places where a java_system_module_import
could not be used in place of a java_system_module. That was because
the code assumed a *SystemModules type not a *systemModulesImport type.
This change introduces a SystemModulesProvider interface that is used
instead and is implemented on both types.

Bug: 142940300
Test: m nothing
      ran new tests before changes to make sure they detected the issue
	  and after to make sure the changes fixed the issue.
Change-Id: I7b16ac5708880bdf61e6f5b1e6616c986f0ed763
2020-02-19 14:24:15 +00:00
Automerger Merge Worker
ab231ee744 Merge "Revert "Another round of no-vendor-variant VNDK whitelist cleanup"" am: ae83ce656d
Change-Id: Icd37145b42d562a22c2eaf8dcda8c8603aacee34
2020-02-19 11:50:25 +00:00
Treehugger Robot
ae83ce656d Merge "Revert "Another round of no-vendor-variant VNDK whitelist cleanup"" 2020-02-19 11:33:48 +00:00
Automerger Merge Worker
3114b0fc94 Merge "Add support for cc_binary in module_exports" am: 23be2bf941
Change-Id: I0560729fe3370ed011cd8bddaba7527babd9d33a
2020-02-19 11:14:04 +00:00
Treehugger Robot
23be2bf941 Merge "Add support for cc_binary in module_exports" 2020-02-19 10:56:38 +00:00
Automerger Merge Worker
dfb9525065 Merge "Add system server jars expressed in make in the system server classpath." am: cbeaab2974
Change-Id: I179a61f8f66393022c9302a6dd30676273555f99
2020-02-19 07:50:23 +00:00
Nicolas Geoffray
cbeaab2974 Merge "Add system server jars expressed in make in the system server classpath." 2020-02-19 07:40:19 +00:00
Albal Tai
7667b62920 Revert "Another round of no-vendor-variant VNDK whitelist cleanup"
This reverts commit 77def87329.

Reason for revert: <cop revert, broken build 6217456 on git_master on cf_x86_phone-userdebug_coverage>

Change-Id: Iaf64cfe8fdfe62d397719f7ca5cc7679e5858d91
2020-02-19 06:17:51 +00:00
Automerger Merge Worker
38fda9cf88 Merge "Enable tautological-bitwise-compare warning" am: 252d7449ca
Change-Id: I941286e4d4162af8304dd51351e7bf335db0f35e
2020-02-19 05:09:01 +00:00
Chih-hung Hsieh
252d7449ca Merge "Enable tautological-bitwise-compare warning" 2020-02-19 04:50:11 +00:00
Automerger Merge Worker
d90c0b9136 Merge "Do not add ccWrapper to ccNoDeps rule" am: 8a2d1b4d86
Change-Id: I1b2cc7644c84ceb7d018c3250684cb6f1f08f6eb
2020-02-19 02:52:51 +00:00
Treehugger Robot
8a2d1b4d86 Merge "Do not add ccWrapper to ccNoDeps rule" 2020-02-19 02:34:33 +00:00
Jiyong Park
e383388f98 Permissions XML file for java_sdk_library is mutated for APEX
This change fixes a regression that was introduced with
I597bccbb177b6b6320c3a3edeff467243230d384. With the change, the content
of the permissions XML file for a java_sdk_library was determined before
the java_sdk_library is mutated for an APEX. As a result, the file path
to the implementation jar library was always set to
/system/framework/*.jar regardless of whether the java_sdk_library is
part of an APEX or not.

This change fixes the problem, by creating the permissions XML file via
a new module type. The content of the xml file is determined after the
xml file is mutated for APEXes.

Bug: 149600642
Test: m

Change-Id: Id21f8d8285df49b0b3be1daf0f101f2bc978eeb0
2020-02-19 09:47:37 +09:00
Automerger Merge Worker
0ac6055a39 Merge "Another round of no-vendor-variant VNDK whitelist cleanup" am: e6c44dc8be
Change-Id: Ia70ace39ced78529ef21bf91ec4cd823740f7fd5
2020-02-18 23:53:45 +00:00
Vic Yang
e6c44dc8be Merge "Another round of no-vendor-variant VNDK whitelist cleanup" 2020-02-18 23:29:08 +00:00
Chih-Hung Hsieh
15631dce8a Enable tautological-bitwise-compare warning
Bug: 148831363
Test: make
Change-Id: I31285fec578a87e0d35c177cd599dcd6a66cf934
Merged-In: I9d1ba8ef50630e40d59e402c37ad1366a8e25ea6
2020-02-18 15:14:03 -08:00
Automerger Merge Worker
2fd8cbe67b Merge "Allow for setting a logging_parent for an Android App." am: 2f94e85f14
Change-Id: I9ea9337569380dbf9bce1508f1d42e7a563afc1e
2020-02-18 23:08:29 +00:00
Treehugger Robot
2f94e85f14 Merge "Allow for setting a logging_parent for an Android App." 2020-02-18 22:57:31 +00:00
Automerger Merge Worker
8fe9f07eef Merge "Switch from clang-r377782 to clang-r377782b" am: 207b18ca35
Change-Id: Id23bcebfc2d5892a5622143294c9bf909e3defcc
2020-02-18 22:11:51 +00:00
Chih-hung Hsieh
207b18ca35 Merge "Switch from clang-r377782 to clang-r377782b" 2020-02-18 21:59:06 +00:00
Peter Collingbourne
4b20d12832 Merge "Statically link the unwinder into binaries packaged into an unbundled APEX with legacy_android10_support: true." am: d8b80bc683
Change-Id: Ie0cfa3841ce93ee166bab27befbde1505beca583
2020-02-18 21:09:00 +00:00
Chih-hung Hsieh
ca4375f54b Merge "Enable bool-operation warning" am: ab392f613e
Change-Id: Ie0226f7313c89878f14f92455d6e01edbdc5e7bb
2020-02-18 20:47:56 +00:00
Peter Collingbourne
d8b80bc683 Merge "Statically link the unwinder into binaries packaged into an unbundled APEX with legacy_android10_support: true." 2020-02-18 18:12:37 +00:00
Chih-hung Hsieh
ab392f613e Merge "Enable bool-operation warning" 2020-02-18 17:52:25 +00:00
Baligh Uddin
5b16dfb39a Allow for setting a logging_parent for an Android App.
Unit test: go test ./... -test.v -run TestOverrideAndroidApp
Unit test: python manifest_fixer_test.py

BUG: 148198056
Change-Id: Ib5ff235d2a93e88b86aec1c0b16327ea938a094d
2020-02-18 09:37:56 -08:00
Paul Duffin
25ce04bd3a Add support for cc_binary in module_exports
Bug: 142920869
Test: m nothing
Change-Id: Ib7e16cb323806782c2186e73e13642e4485fc149
2020-02-18 16:17:35 +00:00
Kousik Kumar
2976bfd568 Do not add ccWrapper to ccNoDeps rule
The "ccNoDeps" rule was introduced to separate out ".s" compilations
from other ".S" and ".c*" compilations. The ".s" compilation does not
produce a dependency file and does not support running a preprocessor
through it.
However, it does have ".include" directives, that do NOT take a macro,
but still does the equivalent of a "#include". The compilation of ".s"
assembly files also do NOT produce a dependency file.

Because they don't produce a dependency file AND because RBE's input
processor does not yet support finding dependencies for these files, I'm
making this change to not prepend rewrapper for these commands.

Test: Tested by running a build with this change and ensuring the ".s"
compilations aren't being sent to rewrapper.

Change-Id: I60bb14ff92596e4992e9f675bdc199f1440d4327
2020-02-18 08:00:17 -08:00
Jaewoong Jung
9bc4a38707 Merge "Simple refactoring of prefix related functions." am: 36b6aec26a
Change-Id: I021d75ff57aa08827fbc365066dd207f6473584c
2020-02-18 15:19:38 +00:00
Jaewoong Jung
36b6aec26a Merge "Simple refactoring of prefix related functions." 2020-02-18 15:08:41 +00:00
John Eckerdal
974b0e80c7 Add CCACHE_DIR to allowed environment variables
Trying to override the default directory for ccache by using the
CCACHE_DIR environment variable fails unless it is in the allowed
list.

Bug: 149670916
Test: manual
Change-Id: I8e7eea7a5c25d7ea5f0956fafc70d62522f3c4fc
2020-02-18 12:28:53 +01:00
Treehugger Robot
bb66146f20 Merge "sdk_version: "system_server_current"" am: 7c9662a8e9
Change-Id: Iff265e505e34e084599aa69fbdca0df87afd02e5
2020-02-18 10:04:09 +00:00
Treehugger Robot
7c9662a8e9 Merge "sdk_version: "system_server_current"" 2020-02-18 09:55:54 +00:00
Chih-Hung Hsieh
287a13fc7e Switch from clang-r377782 to clang-r377782b
Bug: 149509676
Test: make checkbuild
Change-Id: I30c4cda700522968da443cebd3a67a1c428ba2ef
2020-02-18 07:48:13 +00:00
Nicolas Geoffray
47cbfcdd3e Add system server jars expressed in make in the system server classpath.
This was missed in:
https://android-review.googlesource.com/c/platform/build/soong/+/1180134

Test: lunch and build ARC, check SYSTEMSERVERCLASSPATH
Bug: 148944771
Bug: 141785760
Bug: 140451054
Change-Id: I619aee5441f7233010067a6c780e978f38ba7796
2020-02-17 19:47:05 +00:00
Jackal Guo
e8c1a8fddb Merge "Revert "Turn on the instrumentation by default for the java code in APEXes"" am: 954b29728d
Change-Id: I838bbd0ca6da2a8c01b8af4cced575374db7fe9f
2020-02-17 05:23:05 +00:00
Jackal Guo
954b29728d Merge "Revert "Turn on the instrumentation by default for the java code in APEXes"" 2020-02-17 05:12:06 +00:00
Jackal Guo
c021ea0b35 Revert "Turn on the instrumentation by default for the java code in APEXes"
This reverts commit 33b6654eea.

Reason for revert: verify build breakage

Change-Id: I712a9de8ca3bfb17c36d3b8efa6176cdaf26640e
2020-02-17 03:25:56 +00:00
Treehugger Robot
0c7a78cf82 Merge "Add apex name to description" am: 2fe818f8b0
Change-Id: I7f5c3b6935399711f928ddbe96d1d485ee8136de
2020-02-15 00:44:42 +00:00
Treehugger Robot
2fe818f8b0 Merge "Add apex name to description" 2020-02-15 00:29:31 +00:00
Jaewoong Jung
3aff5787e2 Simple refactoring of prefix related functions.
Rename the two prefix-in-list funcs so that their usages are clearer.
Also find and replace all the code that essentially does either.

This introduces additional loops in some places, but I think the added
readability and simplicity outweighs the performance degradation, which
should be negligible anyway.

Test: m nothing
Test: TreeHugger
Change-Id: I37e2276ca0c815105ed0031f23c0b1264b480e4f
2020-02-14 14:33:49 -08:00