Commit graph

18399 commits

Author SHA1 Message Date
Automerger Merge Worker
67a0970d4f Merge "have a per-module switch to turn the symlinking optimizaiton off" am: eb9b9f23ec
Change-Id: I4a4a321e0dffdfdd3b248d37198516c173dce833
2020-02-20 01:58:29 +00:00
Jiyong Park
eb9b9f23ec Merge "have a per-module switch to turn the symlinking optimizaiton off" 2020-02-20 01:47:57 +00:00
Automerger Merge Worker
7550d065da Merge "Automate dependency on inputs of genrule module type." am: 888d92e941
Change-Id: If72442eec40dfcaaf21a73ed6b3c461c9faef9f9
2020-02-20 01:19:28 +00:00
Bill Peckham
888d92e941 Merge "Automate dependency on inputs of genrule module type." 2020-02-20 01:06:00 +00:00
Automerger Merge Worker
0a431d17b6 Merge "Fix .vendor suffix for snapshots" am: 578b7ac691
Change-Id: Ie30a11a2706538f3ca70df940efa48410ba81f81
2020-02-20 00:25:17 +00:00
Automerger Merge Worker
9a99c6f5e7 Merge "Do not hide VNDK prebuilts from make" am: 07f37120e5
Change-Id: I35cbeaeaa2bdd910cd6578f54dd075a4baa81c0d
2020-02-20 00:24:43 +00:00
Automerger Merge Worker
93fc33c215 Merge "Fix build error on vendor_snapshot_static" am: 5b37383464
Change-Id: I305f84bcc4f6b4a306447610b59f2589b332f0cc
2020-02-20 00:24:13 +00:00
Automerger Merge Worker
2009aa299b Merge "Fix header deps of sysprop_library" am: 0298d036e9
Change-Id: I5a4c78fbc6a7e9be227f24d8e481e9d6dc6fae1c
2020-02-20 00:23:44 +00:00
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
Treehugger Robot
578b7ac691 Merge "Fix .vendor suffix for snapshots" 2020-02-20 00:02:44 +00:00
Treehugger Robot
07f37120e5 Merge "Do not hide VNDK prebuilts from make" 2020-02-20 00:02:40 +00:00
Treehugger Robot
5b37383464 Merge "Fix build error on vendor_snapshot_static" 2020-02-20 00:02:34 +00:00
Treehugger Robot
0298d036e9 Merge "Fix header deps of sysprop_library" 2020-02-20 00:02:28 +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
Bill Peckham
c087be1e8b Automate dependency on inputs of genrule module type.
This change automates one of the best practices for
custom tools. The best practice says "Prefer to list
input files on the command line, otherwise we may not
know to re-run your command when a new input file is
added." [1]

Normally you'd reference these inputs with $(in) or
one of the forms of the $(location*) substituions on
the command line for the custom tool. However, if the
custom tool does not accept the list of inputs on the
command line, the build system could fail to re-run
the custom tool if the list changes.

This change adds a hash of the list of input names to
the sbox command that wraps the custom tool. If the
list of inputs change, the hash will change, and
therefore the sbox command will change, causing ninja
to re-run the custom tool. The hash is visible to
(but ignored by) the sbox command, and hidden from
your custom tool.

[1] https://android.googlesource.com/platform/build/soong/+/refs/heads/master/docs/best_practices.md#custom-build-tools

Test: TestGenruleHashInputs
Bug: 149397658
Change-Id: I18b547ea3c4296ee15bd6150a4778a8f376d80b7
2020-02-19 12:47:35 -08: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
Jiyong Park
9d677206d1 have a per-module switch to turn the symlinking optimizaiton off
The optimization is confusing syshealth because the modules will use
more memory when they are switched to the prebuilt (unbundled) or
updated via Play.

Let's have a per-module switch to control the behavior and turn it on
only for non-updatable modules like ART.

Bug: 149805758
Test: m
Change-Id: Ieb842c47f31f3b06e403b1e1f9e463c3e5524107
2020-02-19 20:16:25 +09: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
Inseob Kim
ed2641f469 Fix header deps of sysprop_library
This adds public header to deps correctly.

Bug: 148123511
Bug: 149252327
Test: VNDK_SNAPSHOT_BUILD_ARTIFACTS=true m dist vndk
Change-Id: Ib8df3dfb4a068a11fc647de8588cc52889d82fba
2020-02-19 15:30:02 +09: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
Inseob Kim
5f64aeccdf Fix .vendor suffix for snapshots
.vendor suffix is meant to be attached for vendor variants of
modules without "vendor: true". So when we decide whether the suffix is
needed for a snapshot module, we should check if corresponding source
module is "vendor: true" or not, instead of checking vendor_available of
the source module.

Bug: 149252327
Test: manual
Change-Id: Ibde75737ddce8e1dc974453e88832f9272a2c66e
2020-02-19 13:49:44 +09: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