StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,520 Commits 1 Branch 0 Tags
fc84e8b4d7e4b718b089c7528b84097f9d4150ed
Commit Graph

3557 Commits

Author SHA1 Message Date
Jooyung Han
3be2358038 Merge commit '0703fd873fe2ed492266a4457a1e217971c2f4f0' into manual_merge_1e3d9fb376aaf1be6de1bd16a9004ccc95226ab0 am: 4c92cad10e am: 4d565700b5 am: 378ff68eb5 am: 1b06154e8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12501269

Change-Id: I0e9a408b9547fad45983f39a5b7dbacd19b29c1d
 2020-09-02 08:41:05 +00:00
Jooyung Han
4c92cad10e Merge commit '0703fd873fe2ed492266a4457a1e217971c2f4f0' into manual_merge_1e3d9fb376aaf1be6de1bd16a9004ccc95226ab0 
Change-Id: I7115a50254e23e3f7d9cdab960c671195746978e
 2020-09-02 14:19:18 +09:00
Jooyung Han
3a92fbeaff Merge "apex: support prebuilt_firmware for vendor apexes" 2020-09-02 04:17:43 +00:00
Treehugger Robot
891dd0ab3c Merge "Add compile_dex for java_import" am: e263af74db am: 6346ec0f46 am: 21d661b312 am: c286f17997 am: e34b515796 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1392497

Change-Id: I7e0ff955c8725b0b82546e3854e08392728d50ba
 2020-09-02 04:06:21 +00:00
Treehugger Robot
6346ec0f46 Merge "Add compile_dex for java_import" am: e263af74db 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1392497

Change-Id: I9fbbd7e1f02a64f5e0ed9b583a61e64fd4306362
 2020-09-02 02:02:32 +00:00
Treehugger Robot
e263af74db Merge "Add compile_dex for java_import" 2020-09-02 01:23:54 +00:00
Steve Kim
3b4d2c542c Merge "Revert "Remove create_stubs and checkapi from droiddoc"" am: b695937f12 am: 33c088e1b1 am: a06a9a0d73 am: 6a70afb6da am: 64722a18d8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1417209

Change-Id: I8dd515ba2e98a98e3886da132430404572af95cf
 2020-09-01 21:49:47 +00:00
Steve Kim
a06a9a0d73 Merge "Revert "Remove create_stubs and checkapi from droiddoc"" am: b695937f12 am: 33c088e1b1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1417209

Change-Id: Ic14a2a424c641f1559f7acdf34de0c4fb5320bf7
 2020-09-01 20:02:16 +00:00
Liz Kammer
d6c31d274e Add compile_dex for java_import 
Test: go java tests
Test: m
Bug: 160455085
Change-Id: I2db95dfe565e78b630007adc3360a58614d0127e
 2020-09-01 12:34:08 -07:00
Liz Kammer
10d1d3de5d Merge "Remove create_stubs and checkapi from droiddoc" am: 4297552423 am: 8e97d6caa0 am: 0111644819 am: 8561294520 am: ed5a167ef8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1401388

Change-Id: Idc194aae2289705f5c3e92b9943f5c5b30507b17
 2020-09-01 18:30:38 +00:00
Steve Kim
3666c7023f Revert "Remove create_stubs and checkapi from droiddoc" 
This reverts commit 3a55c91f9d.

Reason for revert: build failed. Guess this is the cause but needs to confirm. Creating a revert per instructions

Change-Id: I30f1c8cd63e5ab84dba5d21ed354a42695c24ec4
 2020-09-01 17:58:01 +00:00
Liz Kammer
0111644819 Merge "Remove create_stubs and checkapi from droiddoc" am: 4297552423 am: 8e97d6caa0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1401388

Change-Id: I41b23ae2a163fd940333ae94bdfa068bff75a8d7
 2020-09-01 17:13:52 +00:00
Ulya Trafimovich
21a7375205 Allow non-SDK Java libraries to masquerade as <uses-library>. 
Extend usesLibraryProperties with a boolean is_uses_lib property and
move these properties from java.AndroidApp to java.Module to allow
java.Library modules set the new propery and be recognized as
<uses-library> by Soong.

Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Change-Id: I01cd5e0da3dd543c1c0597249d37d0914b213ca7
 2020-09-01 17:45:39 +01:00
Anton Hansson
944e77d219 Change sdk_library child visibility semantics 
If specified, the more specific *_visibility attribute override the
visibility attribute.

This is a temporary solution local to java_sdk_library. Ideally this
should be applied to all modules that create child modules.

Bug: 165017290
Test: m
Change-Id: Ia8c5ae119623a83d8ac583c602320915bb8c7f33
 2020-09-01 15:17:41 +01:00
Jooyung Han
0703fd873f apex: support prebuilt_firmware for vendor apexes 
prebuilt_firmware module is one of many prebuilt_etc-like modules. When
it is soc-specific, it is installed in /vendor/firmware. Similarly, when
prebuilt_firmware is embeded in a vendor apex, installing it in
<apex>/firmware instead of <apex>/etc.

Bug: 162701747
Test: lunch sunfish-userdebug
      m && device boots && vibrator works
Change-Id: I00d28cde42259aaf8221e3897df77efc42b0c1ca
 2020-09-01 10:45:13 +09:00
Liz Kammer
3a55c91f9d Remove create_stubs and checkapi from droiddoc 
Test: m docs
Test: go java tests
Bug: 144248501
Bug: 143136634
Change-Id: Ic0da89332f3ed2e5e1bb36d00cb9cbd1f6282b45
 2020-08-31 08:16:22 -07:00
Xin Li
65cb5c69ea Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: Ifca7b65f4e27bf14cdc30f72f790b0de90130bae
Change-Id: I3a39be5f0b8736de4822c6a14072c78d4e4ad89d
 2020-08-29 01:17:45 -07:00
Ulyana Trafimovich
624c465e6b Merge "Propagate transitive SDK Java library dependencies to dexpreopt." am: b8822a0616 am: eb285d43fe am: 2ff8b5df62 am: f8c069ca19 am: c7d89b38e2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1408708

Change-Id: I30014080ce51b95821156d4b20302ca7131f40ef
 2020-08-28 12:07:35 +00:00
Ulyana Trafimovich
2ff8b5df62 Merge "Propagate transitive SDK Java library dependencies to dexpreopt." am: b8822a0616 am: eb285d43fe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1408708

Change-Id: Iecbedae2d07363f625a0fecba1f4a7adedcdd860
 2020-08-28 10:35:50 +00:00
Ulyana Trafimovich
b8822a0616 Merge "Propagate transitive SDK Java library dependencies to dexpreopt." 2020-08-28 09:36:13 +00:00
Treehugger Robot
a9fac3ef44 Merge "Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES" am: 10a3873a80 am: 21f698a5c6 am: 8edb789774 am: 91fb8f782e am: 5067b5d87e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1393237

Change-Id: I6910b1fe2122209623459687dfdb62e5dcef419a
 2020-08-28 06:13:20 +00:00
Treehugger Robot
8edb789774 Merge "Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES" am: 10a3873a80 am: 21f698a5c6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1393237

Change-Id: I54c57cad9d581fea5fba5ce30f1465f54b9e276c
 2020-08-28 04:59:26 +00:00
Jeongik Cha
219141c6bb Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES 
If BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES has a numeric value,
it replaces "current" or "system_current" with the version which
the flag indicates.

Bug: 163009188
Test: BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES=29 m, and then check if every vendor
java module's sdk_version is 29 if its sdk_version was current.

Change-Id: I17b49b8e02caf2d1bc57b91648d4420f3ad9fcb9
 2020-08-27 23:09:54 +09:00
Ulya Trafimovich
fc24ad3d4e Propagate transitive SDK Java library dependencies to dexpreopt. 
For some dependencies, like stubs, the SDK library may not be found at
build time (either because the implementation library is not among the
dependencies of the dexpreopted module, or because it's part of a
prebuilt, or because it's missing from the build altogether). In such
cases dexpreopt is useless, because dex2oat does not have access to the
full classpath (unless the &-classpath is used). Therefore do not
dexpreopt in such cases.

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: If289088cfd103011ccb16165e95a97b30fd31b81
 2020-08-27 11:47:15 +01:00
Treehugger Robot
49f641e5e9 Merge "Support ninja rsp files in soong_zip" am: 4c2e4f381a am: 1e4fbc23bf am: 15bbb3b646 am: 905f3fe3f8 am: eecb1b577d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1405368

Change-Id: I3281a64f94f9310be02c02ad2f8981b9fa3cdf42
 2020-08-24 23:12:16 +00:00
Liz Kammer
56fda241cf Merge "Add imports_sdk_version to prebuilt_apis" am: 9c07d24477 am: 380c67920e am: 299ac6f313 am: bb6e43e084 am: 528bdb3a72 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1397557

Change-Id: I4d9644f390a92a104c0770b6d6ca420cf9dac4c9
 2020-08-24 21:15:11 +00:00
Treehugger Robot
15bbb3b646 Merge "Support ninja rsp files in soong_zip" am: 4c2e4f381a am: 1e4fbc23bf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1405368

Change-Id: Iaea9c5749421e82a8a9f2c713c2d53c8abf44663
 2020-08-24 20:03:37 +00:00
Treehugger Robot
4c2e4f381a Merge "Support ninja rsp files in soong_zip" 2020-08-24 18:40:56 +00:00
Liz Kammer
299ac6f313 Merge "Add imports_sdk_version to prebuilt_apis" am: 9c07d24477 am: 380c67920e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1397557

Change-Id: I437525704afad81236bca0a87187a3491e34235d
 2020-08-24 18:27:44 +00:00
Liz Kammer
9c07d24477 Merge "Add imports_sdk_version to prebuilt_apis" 2020-08-24 16:50:51 +00:00
Treehugger Robot
1baa7b7421 Merge "Add extra_test_configs option" am: ec7a91f9fa am: 82448f2d2d am: 180a485b50 am: 437bb3b11d am: 57fa8ee91c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1402168

Change-Id: Ib63b87c02158c5454806a3f14c1aaf9ae890e387
 2020-08-21 18:43:33 +00:00
Treehugger Robot
180a485b50 Merge "Add extra_test_configs option" am: ec7a91f9fa am: 82448f2d2d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1402168

Change-Id: If619742e8271e804231d029a87f5fa1297959488
 2020-08-21 17:26:05 +00:00
Treehugger Robot
ec7a91f9fa Merge "Add extra_test_configs option" 2020-08-21 16:22:43 +00:00
Treehugger Robot
aac4ca8e57 Merge "Remove duplicated use of UsesLibraryDependency" am: f5a2b8a641 am: bc9a8dfc01 am: dae8b9a6dd am: 3a7aeecb5b am: c52d6cc3fe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1405677

Change-Id: Id0a5bc06e01abf2031c9c112a4daa9020c9df782
 2020-08-21 11:27:00 +00:00
Ulyana Trafimovich
03c201fe18 Merge "Use common helper functions for getting sorted map keys." am: 49b1e9b6ce am: d972866eb5 am: 9f3062747a am: 4334875793 am: 6f53dedf85 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1404519

Change-Id: I6dcb6c6e271802ce91ded52c3b2e689dcb3d671d
 2020-08-21 11:26:47 +00:00
Ulyana Trafimovich
d1fa0cf81f Merge "Propagate transitive <uses-library> dependencies through static libraries." am: bde92fc6be am: df14a1b9c2 am: c3036fea58 am: 63c7276405 am: 61e808e1c9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1404787

Change-Id: Ic1bb9fe886b1c29099613b235561d339e5d2e989
 2020-08-21 11:26:23 +00:00
Treehugger Robot
dae8b9a6dd Merge "Remove duplicated use of UsesLibraryDependency" am: f5a2b8a641 am: bc9a8dfc01 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1405677

Change-Id: Iad7b631ad3d82d91bf83e0b997e04087ea59a7c3
 2020-08-21 10:20:12 +00:00
Ulyana Trafimovich
9f3062747a Merge "Use common helper functions for getting sorted map keys." am: 49b1e9b6ce am: d972866eb5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1404519

Change-Id: I0f54749723d7883712243d813f41321d3400a899
 2020-08-21 10:19:59 +00:00
Ulyana Trafimovich
c3036fea58 Merge "Propagate transitive <uses-library> dependencies through static libraries." am: bde92fc6be am: df14a1b9c2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1404787

Change-Id: If5cdcd9ac021315fd44aca73fdc14ec63cce4b7c
 2020-08-21 10:19:46 +00:00
Treehugger Robot
f5a2b8a641 Merge "Remove duplicated use of UsesLibraryDependency" 2020-08-21 10:01:58 +00:00
Ulyana Trafimovich
49b1e9b6ce Merge "Use common helper functions for getting sorted map keys." 2020-08-21 09:36:30 +00:00
Ulyana Trafimovich
bde92fc6be Merge "Propagate transitive <uses-library> dependencies through static libraries." 2020-08-21 09:36:10 +00:00
Treehugger Robot
952140ab59 Merge "Reland: Deduplicate APEX variants that would build identically" am: 68bfe074c6 am: a3d1c127a2 am: 4d9984eeb1 am: 76309aab5d am: a106e405e9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1405087

Change-Id: I5ba652222b6c9ed40fd8c643f92485b26842bd9b
 2020-08-21 08:43:24 +00:00
Treehugger Robot
4d9984eeb1 Merge "Reland: Deduplicate APEX variants that would build identically" am: 68bfe074c6 am: a3d1c127a2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1405087

Change-Id: I7cf0c8d2c27757395e54fb4cc8592f438aa6ccaa
 2020-08-21 07:38:47 +00:00
Treehugger Robot
68bfe074c6 Merge "Reland: Deduplicate APEX variants that would build identically" 2020-08-21 06:46:51 +00:00
Treehugger Robot
5f7fa4ce75 Merge "Capture list of unused methods when shrinking in R8" am: c23d6031b0 am: 305935590d am: c4882aad53 am: 9a1eb54d81 am: 1f67506d6c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1401848

Change-Id: I706f472e6d5771d2ba533c9d1f1ed28fe7d40fba
 2020-08-21 02:03:15 +00:00
Treehugger Robot
c4882aad53 Merge "Capture list of unused methods when shrinking in R8" am: c23d6031b0 am: 305935590d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1401848

Change-Id: Ib4b985bd627d57a210c0d49c1e2e933ba958dba0
 2020-08-21 00:49:14 +00:00
Treehugger Robot
c23d6031b0 Merge "Capture list of unused methods when shrinking in R8" 2020-08-21 00:28:24 +00:00
Liz Kammer
9b7ecd76f5 Remove duplicated use of UsesLibraryDependency 
This was resulting in a soong java test failure:
./java.go:994:80: ambiguous selector dep.DexJarBuildPath
./java.go:994:103: ambiguous selector dep.DexJarInstallPath
./java.go:2595:58: ambiguous selector dep.DexJarBuildPath
./java.go:2595:81: ambiguous selector dep.DexJarInstallPath
./sdk_library.go:879:2: duplicate method DexJarBuildPath
./sdk_library.go:879:2: duplicate method DexJarInstallPath

Test: go test java tests
Test: m
Change-Id: I34465907f917d94be643be7322215fc35fc5fbe6
 2020-08-20 13:50:42 -07:00
Liz Kammer
2d2fd859bb Add imports_sdk_version to prebuilt_apis 
This allows setting the prebuilt sdk's generated java_imports
sdk_version to "none".

Test: go tests
Test: m
Bug: 160455085
Change-Id: Id24aca811f0f09692971e63418da6685d8351737
 2020-08-20 09:48:50 -07:00