Commit graph

20174 commits

Author SHA1 Message Date
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
98f712056e Merge "Add CCACHE_DIR to allowed environment variables" am: b34ebcf03b am: d65bac5154 am: 192a490ea6
Change-Id: Iba53b85c06cb3d52fad75ad2b2f732065084dd9d
2020-02-19 23:18:41 +00:00
Automerger Merge Worker
92f08f159d Merge "Port IdentityCredential HAL to AIDL." am: c2937d29a8 am: 14e3fc1a29 am: 3f003e3917
Change-Id: If6989f33ec6965f1c63b1a2ca72bc2f99988b488
2020-02-19 23:18:16 +00:00
Automerger Merge Worker
d747661d5f Merge "Allow java_system_modules_import to replace java_system_modules" am: 1876a76216 am: b51bc93c26 am: 6a0ba5b023
Change-Id: I3e9f9c066750a032b96a573b27e44dec7aa64ef2
2020-02-19 23:00:56 +00:00
Chih-Hung Hsieh
de21a358c3 Enable bitwise-conditional-parentheses warning
Bug: 148286937
Test: make
Change-Id: Ib793e35e1f3098e2cce760bcbf0f115ae5764c7f
2020-02-19 22:54:42 +00:00
Automerger Merge Worker
3e7d321b56 Merge "Allow vts config to be packaged in other test suites" am: 24f3c99af8 am: b8acf86cda am: 97c0686199
Change-Id: I240c0b0b5744ee859bba5393620b56de5b69435a
2020-02-19 22:45:03 +00:00
Automerger Merge Worker
192a490ea6 Merge "Add CCACHE_DIR to allowed environment variables" am: b34ebcf03b am: d65bac5154
Change-Id: I980bd9ba5651b6465058d9d4dba5826851f96a0b
2020-02-19 22:39:44 +00:00
Automerger Merge Worker
3f003e3917 Merge "Port IdentityCredential HAL to AIDL." am: c2937d29a8 am: 14e3fc1a29
Change-Id: Ia7edf36335e48f41720b46dc21b510a6f29a4be0
2020-02-19 22:38:30 +00:00
Automerger Merge Worker
6a0ba5b023 Merge "Allow java_system_modules_import to replace java_system_modules" am: 1876a76216 am: b51bc93c26
Change-Id: I33de58799d75671c9a000598a31a72eb7bc6db66
2020-02-19 22:38:07 +00:00
Automerger Merge Worker
97c0686199 Merge "Allow vts config to be packaged in other test suites" am: 24f3c99af8 am: b8acf86cda
Change-Id: Idf504399548dd83a1040d2a40a77889ed17d7f83
2020-02-19 22:29:52 +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
Artur Satayev
79fac05b45 Use flag names with merge_csv.py.
Bug: 145132366
Test: diff -w out/soong/hiddenapi/hiddenapi-greylist.csv
Change-Id: If63c8ae5eda48e49bf58a338bf08f0f2d4fea3cf
2020-02-19 13:24:04 +00:00
Automerger Merge Worker
2a93a35752 Merge "Revert "Another round of no-vendor-variant VNDK whitelist cleanup"" am: ae83ce656d am: ab231ee744 am: 2d0fe41f83
Change-Id: I9b46a3708408aef10313bf23615052997428c874
2020-02-19 12:21:20 +00:00
Automerger Merge Worker
2d0fe41f83 Merge "Revert "Another round of no-vendor-variant VNDK whitelist cleanup"" am: ae83ce656d am: ab231ee744
Change-Id: I9f72ae78b8341b1b20250c0f8090513db6e77e7a
2020-02-19 12:08:06 +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
Automerger Merge Worker
5a993174dc Merge "Add support for cc_binary in module_exports" am: 23be2bf941 am: 3114b0fc94 am: ae41b77938
Change-Id: I4a3aaff388fe15da9b804981fa0c2bd75899c3b6
2020-02-19 11:41:47 +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
ae41b77938 Merge "Add support for cc_binary in module_exports" am: 23be2bf941 am: 3114b0fc94
Change-Id: Ia30a6aacbe6d3d9a6dd7ca115905166f66d98320
2020-02-19 11:28:59 +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
6d2ff7f539 Merge "Add system server jars expressed in make in the system server classpath." am: cbeaab2974 am: dfb9525065 am: 77aafce45a
Change-Id: I2e3a61e1da81613886feab8f3ddaa078dce8addf
2020-02-19 08:18:44 +00:00
Automerger Merge Worker
77aafce45a Merge "Add system server jars expressed in make in the system server classpath." am: cbeaab2974 am: dfb9525065
Change-Id: If051c37e9ff734907307ee2a365bef4a17f8cec8
2020-02-19 08:07:53 +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
2b350f8f47 [automerger skipped] Merge "Enable tautological-bitwise-compare warning" am: 252d7449ca am: 38fda9cf88 am: a56edc6e4c -s ours
am skip reason: Change-Id I9d1ba8ef50630e40d59e402c37ad1366a8e25ea6 with SHA-1 45709ee8f1 is in history

Change-Id: I2b24e6c57cfe9f39b0c5cdf8944050b2a59b86cd
2020-02-19 05:47:23 +00:00
Automerger Merge Worker
a56edc6e4c Merge "Enable tautological-bitwise-compare warning" am: 252d7449ca am: 38fda9cf88
Change-Id: I09609767f0c17072306fb1f35fdf47023e2eef81
2020-02-19 05:30:17 +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
aaeb2930b6 Merge "Do not add ccWrapper to ccNoDeps rule" am: 8a2d1b4d86 am: d90c0b9136 am: 0090db54d6
Change-Id: Ib887df74bf1cd7e6b917029002333bec6631bffb
2020-02-19 03:24:15 +00:00