Commit Graph

62860 Commits

Author SHA1 Message Date
Colin Cross
a9b9e6e5ff Merged and dist lists of unused methods from R8
Merge all the proguard_usage.zip files produced by the R8 rules and
dist the result.

Bug: 151857441
Test: m TARGET_BUILD_APPS=DocumentsUI dist
Change-Id: I7e6d73241478016093a203dc7bd86407ab86a4ac
2020-08-17 19:31:22 +00:00
Treehugger Robot
e60f9825b9 Merge "Enable configurable audio policy on generic_system" am: baade4a3c4
Original change: https://android-review.googlesource.com/c/platform/build/+/1395771

Change-Id: I28e390955a21bda06cea965dab84abd243730272
2020-08-17 08:56:39 +00:00
Treehugger Robot
baade4a3c4 Merge "Enable configurable audio policy on generic_system" 2020-08-17 08:45:38 +00:00
Treehugger Robot
0508bd6842 Merge "Include vendor overrides in system prop if not split" am: 2e80113ad2
Original change: https://android-review.googlesource.com/c/platform/build/+/1399399

Change-Id: I8c961466fe21223c441c422ba457c12427d840c0
2020-08-14 18:20:21 +00:00
Treehugger Robot
2e80113ad2 Merge "Include vendor overrides in system prop if not split" 2020-08-14 18:03:31 +00:00
Hongguang Chen
370a65b4c3 Enable configurable audio policy on generic_system
BUG: 132639720
BUG: 163379087
Test: make aosp_arm64 and check artifacts.
Change-Id: Ide4dc68d5770854daa3acdff5dda78dfa4a941bc
Merged-In: Ide4dc68d5770854daa3acdff5dda78dfa4a941bc
2020-08-14 09:23:56 -07:00
JaeMan Park
df762465f5 Merge "Rename mainline_system(.*).mk to generic_system(.*).mk" am: 84b8225429
Original change: https://android-review.googlesource.com/c/platform/build/+/1396210

Change-Id: Icec496fb01a2bdad0ef109b3d012a68cfae2b90f
2020-08-14 09:06:36 +00:00
JaeMan Park
84b8225429 Merge "Rename mainline_system(.*).mk to generic_system(.*).mk" 2020-08-14 08:54:33 +00:00
Garfield Tan
04714da51c Include vendor overrides in system prop if not split
Bug: 163854285
Test: m on crosshatch. Vendor overrides are included in
system/build.prop on legacy devices.

Change-Id: Ib134f934de8546af3dff27312f6877eafe5ed22c
2020-08-13 18:42:43 -07:00
Treehugger Robot
02694ffe29 Merge "Document unbundle build behavior" am: d67e588939
Original change: https://android-review.googlesource.com/c/platform/build/+/1358105

Change-Id: Ib7c9ad116b68d999d0507e4c1e63547e712fdc60
2020-08-14 01:26:28 +00:00
Treehugger Robot
d67e588939 Merge "Document unbundle build behavior" 2020-08-14 01:14:59 +00:00
Treehugger Robot
43044f0bb9 Merge "Set RBE_DIR default value to point to prebuilts in tree." am: 9c81a78e97
Original change: https://android-review.googlesource.com/c/platform/build/+/1397927

Change-Id: I9c26908c64cac30c754d381aaf84208bd71cfdd3
2020-08-13 22:29:14 +00:00
Treehugger Robot
9c81a78e97 Merge "Set RBE_DIR default value to point to prebuilts in tree." 2020-08-13 22:12:42 +00:00
Ramy Medhat
3491bbdbf8 Add function to export default values for RBE related variables
Test: ran rbesetup.sh and small build after.
Change-Id: I429835f1bb6da75e2fcee7e9ddac6b11672121cd
2020-08-13 14:41:32 -04:00
Ramy Medhat
ba6d777f25 Set RBE_DIR default value to point to prebuilts in tree.
The new default points to prebuilts/remoteexecution-client/live.

Also sets the default exec strategy of Javac/R8/D8 to remote local
fallback.

Test: simple one action build
Change-Id: I3392a0f7ac6de818d0c5ba2e113fcb035c6fa0ae
2020-08-13 11:49:30 -04:00
JaeMan
20cdc90938 Rename mainline_system(.*).mk to generic_system(.*).mk
Rename mainline_system to generic_system in mk files
to avoid confusion with mainline module.

First, move mainline_system(.*).mk to generic_system(.*).mk
and make previous mainline_system(.*).mk to just inherit
generic_system(.*).mk to make alias except mainline_system.mk.
is just symlink to generic_system.mk.

These aliasing file will be kept remain during migration
for preventing build breakage and making changes possible
during migration.

Bug: 160649682
Test: lunch generic_system_arm64 && m nothing
Test: lunch generic_system_x86 && m nothing
Test: lunch generic_system_x86_64 && m nothing
Test: lunch generic_system_x86_arm && m nothing
Test: lunch mainline_system_arm64 && m nothing
Test: lunch mainline_system_x86 && m nothing
Test: lunch mainline_system_x86_64 && m nothing
Test: lunch mainline_system_x86_arm && m nothing
Change-Id: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
Merged-In: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
(cherry picked from commit 6f16b5764b)
2020-08-13 07:39:30 +00:00
Yo Chiang
828d46fbbe Bypass missing required module check on ASAN SANITIZE_TARGET build
ASAN SANITIZE_TARGET build may have missing dependencies due to
executables being skipped, thus bypass the required module check.
https://source.android.com/devices/tech/debug/asan#sanitize_target

Also streamline the bypassing logic.

Fix: 163802658
Test: TH
Test: lunch aosp_cf_x86_pasan-userdebug &&
  m SANITIZE_TARGET=address nothing
Change-Id: Ia43c942ce7eae718bf6fcd254307535e418a70e7
2020-08-13 12:45:52 +08:00
Treehugger Robot
4b539172c1 Merge "Use the soong-built NDK CRT objects." am: 14350c575f
Original change: https://android-review.googlesource.com/c/platform/build/+/1365604

Change-Id: I1631283d0ba462ea1a37c6a324183565e8f97388
2020-08-12 22:16:11 +00:00
Treehugger Robot
14350c575f Merge "Use the soong-built NDK CRT objects." 2020-08-12 22:01:27 +00:00
Kousik Kumar
fe33530a8a Merge "Remove double quotes in rbe.mk file" am: 08dcccb16a
Original change: https://android-review.googlesource.com/c/platform/build/+/1397848

Change-Id: I5b52b72fbd02744374e104aa82eee3be34ab93b0
2020-08-12 18:19:58 +00:00
Treehugger Robot
1be828f466 Merge "Package the JDK into test suite zips" am: 682aa6879a
Original change: https://android-review.googlesource.com/c/platform/build/+/1118180

Change-Id: If8dbb1f2b86f7c1653e3396ac1ae07ba391e54dd
2020-08-12 18:19:45 +00:00
Kousik Kumar
08dcccb16a Merge "Remove double quotes in rbe.mk file" 2020-08-12 18:16:32 +00:00
Treehugger Robot
682aa6879a Merge "Package the JDK into test suite zips" 2020-08-12 17:58:44 +00:00
Dan Willemsen
b62d6bb5ee Merge "Reland "Move some prebuilt build tool configs to Soong"" am: 1a9ee40547
Original change: https://android-review.googlesource.com/c/platform/build/+/1393145

Change-Id: Ib3e632bf848c24bc53a877596c9a1f51fe350fbc
2020-08-12 15:01:32 +00:00
Dan Willemsen
1a9ee40547 Merge "Reland "Move some prebuilt build tool configs to Soong"" 2020-08-12 14:48:08 +00:00
Kousik Kumar
151dd8fadb Remove double quotes in rbe.mk file
These result in weird command line invocations when used with RBE.

Test: Ran an RBE build locally and made sure it still worked as expected
after the change.
Bug: b/163618332

Change-Id: Ic8a8adb3fffb357754384ddbf13684d944a9767e
2020-08-12 13:38:59 +00:00
Yo Chiang
02e56fc624 Merge changes Ib89ef776,I5cdc56c7 am: 2dcabab1c9
Original change: https://android-review.googlesource.com/c/platform/build/+/1396214

Change-Id: I3d34302b4c014484a8116fe8442d2a878d7d15ab
2020-08-12 04:08:10 +00:00
Yo Chiang
b37bb1d8c6 Require required modules to exist am: 64faf88940
Original change: https://android-review.googlesource.com/c/platform/build/+/1306572

Change-Id: I15f728dcd0a73269ec99146982f2763f2e169ac3
2020-08-12 04:08:08 +00:00
Yo Chiang
d4aef1614a Merge "Don't call $(my_path_comp) if $(dir $(LOCAL_PATH)) is TOP" am: 15fbad3dfa
Original change: https://android-review.googlesource.com/c/platform/build/+/1396208

Change-Id: I33fdefd63beb33fd95b9f9930dff89ff2b4cb561
2020-08-12 04:07:44 +00:00
Yo Chiang
2dcabab1c9 Merge changes Ib89ef776,I5cdc56c7
* changes:
  Disable required modules check on darwin
  Require required modules to exist
2020-08-12 03:56:10 +00:00
Yo Chiang
15fbad3dfa Merge "Don't call $(my_path_comp) if $(dir $(LOCAL_PATH)) is TOP" 2020-08-12 03:55:57 +00:00
Colin Cross
fa4f72000b Package the JDK into test suite zips
Allow hermetically running the test suites by packaging the JDK
into the output zip file.

Bug: 139202337
Test: m cts && zipinfo out/host/linux-x86/cts/android-cts.zip
Change-Id: I6a59bb97a33113c83df9c7162e9c65ca90a8c196
2020-08-11 23:35:56 +00:00
Pirama Arumuga Nainar
35de4fa5e0 Merge "[config_sanitizers] Fail if LOCAL_SANITIZE_BLACKLIST is used." am: 6552424ff9
Original change: https://android-review.googlesource.com/c/platform/build/+/1384276

Change-Id: I79d9905f1cd3ff60622dafadbeb83dae792e291d
2020-08-11 21:42:57 +00:00
Pirama Arumuga Nainar
6552424ff9 Merge "[config_sanitizers] Fail if LOCAL_SANITIZE_BLACKLIST is used." 2020-08-11 21:23:56 +00:00
Pirama Arumuga Nainar
1ac5384aaf [config_sanitizers] Fail if LOCAL_SANITIZE_BLACKLIST is used.
All uses of this property have been migrated to
LOCAL_SANITIZE_BLOCKLIST.

Update language to comply with Android’s inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Bug: 162245450

Test: Add the old property to an Android.mk and ensure error is thrown.
Change-Id: I797ff651f03b954b410f76f4d201a962ded717df
2020-08-11 11:00:53 -07:00
Yo Chiang
9ce76bb1c4 Disable required modules check on darwin
Bug: 162102724
Test: `make sdk` on darwin
Change-Id: Ib89ef776475c5a20574f78188a2b5cad5fdd8f00
Merged-In: Ib89ef776475c5a20574f78188a2b5cad5fdd8f00
(cherry picked from commit 4d2ea47f06)
2020-08-11 23:54:04 +08:00
Yo Chiang
17d9d8bac8 Merge "Revert "Error if $(LOCAL_PATH) is empty"" am: b5bbe4bca0
Original change: https://android-review.googlesource.com/c/platform/build/+/1396212

Change-Id: I7d34b239ada4b752d46625d28a93146089216774
2020-08-11 10:38:20 +00:00
Yo Chiang
b5bbe4bca0 Merge "Revert "Error if $(LOCAL_PATH) is empty"" 2020-08-11 10:21:24 +00:00
Yo Chiang
e01766433a Revert "Error if $(LOCAL_PATH) is empty"
This reverts commit 60052f3a9f.

Reason for revert: Breaks build_test

Bug: 163473133
Change-Id: Ib5a8030f7b49b131f912e2df8026d3e2107c87a4
2020-08-11 10:19:32 +00:00
Treehugger Robot
ba2db4729f Merge "Remove obsolete PDK build functionality" am: 614b3e4d9e
Original change: https://android-review.googlesource.com/c/platform/build/+/1320119

Change-Id: Iec7984ac1fd7259921dbb613c161e6a006fab971
2020-08-11 09:41:58 +00:00
Treehugger Robot
614b3e4d9e Merge "Remove obsolete PDK build functionality" 2020-08-11 09:28:01 +00:00
Yo Chiang
1d2de91456 Merge "Error if $(LOCAL_PATH) is empty" am: cbdfc3a5ed
Original change: https://android-review.googlesource.com/c/platform/build/+/1396207

Change-Id: Icd947b29a97698545998cfb3d06ef8ab77e2c813
2020-08-11 08:17:30 +00:00
Yo Chiang
cbdfc3a5ed Merge "Error if $(LOCAL_PATH) is empty" 2020-08-11 07:58:57 +00:00
Yo Chiang
136824c6e9 Merge "Revert^2 "releasetools: Disable host module on darwin"" am: 76279b102f
Original change: https://android-review.googlesource.com/c/platform/build/+/1393358

Change-Id: Ibfb18d03e37162345c3f0a39434be11df234e8fa
2020-08-11 05:15:55 +00:00
Yo Chiang
76279b102f Merge "Revert^2 "releasetools: Disable host module on darwin"" 2020-08-11 04:56:55 +00:00
Yo Chiang
096c515976 Revert^2 "releasetools: Disable host module on darwin"
0ac3666667

Exempt-From-Owner-Approval: Original change was approved

Change-Id: I4030dbc072a90f9b8704926c0956787c75bc5583
2020-08-11 04:56:31 +00:00
Yo Chiang
60052f3a9f Error if $(LOCAL_PATH) is empty
Bug: 162918277
Test: m com.android.art
Test: m MODULES-IN-art
Change-Id: I7c35dba22385e89313ea7210e9b1db15c7f6af86
2020-08-11 11:23:08 +08:00
Yo Chiang
150a1ca0c2 Don't call $(my_path_comp) if $(dir $(LOCAL_PATH)) is TOP
So we don't accidentally create phony rules like
`MODULES-IN-: MODULES-IN-` and `MODULES-IN-.: MODULES-IN-*`

Bug: 162918277
Test: m com.android.art
Test: ninja -t browse
Change-Id: Id0656d1b08bc933df57914df162853934352593b
2020-08-11 11:22:36 +08:00
Treehugger Robot
3667804395 Merge "extract_kernel.py: add support to output compiler information" am: b83c9d0461
Original change: https://android-review.googlesource.com/c/platform/build/+/1393369

Change-Id: Iac1f9e9df8ef0a846806fa4527c129dfccd9e96b
2020-08-11 02:52:00 +00:00
Treehugger Robot
b83c9d0461 Merge "extract_kernel.py: add support to output compiler information" 2020-08-11 02:32:23 +00:00