StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,456 Commits 1 Branch 0 Tags
09e2aa9e849e37b62a02c0da45106f8cf5656b4b
Commit Graph

822 Commits

Author SHA1 Message Date
Colin Cross
cc57c7af6e manual merge of 2ef16cfcd4 to rvc-dev-plus-aosp am: 973d6813cd am: b9f41cc869 am: a7624ddebc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11856302

Change-Id: Icece967bdcd4dbe76e5f2c8b9edabe6367626b08
 2020-06-13 03:33:33 +00:00
Colin Cross
973d6813cd manual merge of 2ef16cfcd4 to rvc-dev-plus-aosp 
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I768c3fe568fee764cb0b533e73a3fef719adf30c
 2020-06-12 17:49:09 -07:00
Orion Hodson
ab67d8f9b4 Remove libnativehelper modules from whitelist 
Bug: 147364041
Test: m nothing
Change-Id: I6a43511fee3feeb164e07d5620eea0564fbee302
 2020-06-12 09:47:17 +01:00
Colin Cross
440e0d0542 Use inclusive language in build/soong 
Test: m checkbuild
Change-Id: Id07890b7cbc2397291a658ca00e86b43c743aafc
 2020-06-11 15:33:16 -07:00
Elliott Hughes
f15c6035bd Merge "Remove TARGET_PREFER_32_BIT support." am: a82ad479a4 am: 274a80c492 am: f48d50bfb7 am: f9b97303e6 am: ca5d9f3833 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1289612

Change-Id: I74448886b10c7f23fb40c53bcf08175a8829b44b
 2020-06-10 19:21:28 +00:00
Elliott Hughes
f48d50bfb7 Merge "Remove TARGET_PREFER_32_BIT support." am: a82ad479a4 am: 274a80c492 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1289612

Change-Id: I8862a464aa374922dadedd68e47d1705b8ce5836
 2020-06-10 18:36:54 +00:00
Christopher Ferris
1f16b27511 Remove libc_scudo references. 
Test: Builds and boots.
Change-Id: Iad97159e6193f7afffd8fbc9456427eee5d150e3
 2020-06-09 10:52:39 -07:00
Elliott Hughes
79ae341d4b Remove TARGET_PREFER_32_BIT support. 
Bug: https://issuetracker.google.com/138812821
Test: builds
Change-Id: If96cccbd82ba1311165d61c947c928c6e7cd5593
 2020-06-08 16:37:13 -07:00
Sasha Smundak
c4f0ff1d6c Cherrypick aosp/1318079 and aosp/1324841 
Allow apex module to have android_app_set as its constituent.
Fix android_app_set documentation

Fixes: 157166068
Test: treehugger & manual
Change-Id: I9f91f1b761286f489d175eb0772f78f702e8a2d6
Merged-In: I9f91f1b761286f489d175eb0772f78f702e8a2d6
Merged-In: Id9b296d9301902deb463b299413491bc66d58944
 2020-06-05 15:39:38 -07:00
Anton Hansson
d7fdfd6e77 Merge "dex_import can be added to apex" into rvc-dev 2020-06-05 10:05:50 +00:00
Anton Hansson
4ecb0d6bb0 Merge "Use Stem where output file name is expected in APEX" into rvc-dev 2020-06-05 10:05:50 +00:00
Treehugger Robot
78f237a461 Merge "Allow apex module to have android_app_set as its constituent." am: a5c94e1409 am: 342b4810a7 am: dba1360d03 am: 7a26fadcd6 am: 6ea5538255 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1318079

Change-Id: I36a9a62c389505cbc6aa1d15435b2e450f118697
 2020-06-05 07:14:32 +00:00
Treehugger Robot
dba1360d03 Merge "Allow apex module to have android_app_set as its constituent." am: a5c94e1409 am: 342b4810a7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1318079

Change-Id: If27ef9b94e59620abcf2ef1179f51c2e5ca9b10f
 2020-06-05 06:22:41 +00:00
Treehugger Robot
a5c94e1409 Merge "Allow apex module to have android_app_set as its constituent." 2020-06-05 05:52:51 +00:00
Sasha Smundak
18d98bc3e0 Allow apex module to have android_app_set as its constituent. 
Fixes: 157166068
Test: treehugger & manual
Change-Id: I9f91f1b761286f489d175eb0772f78f702e8a2d6
 2020-06-04 20:25:53 -07:00
Ulyana Trafimovich
acf5facc47 Revert^2 "Rename DexJar interface method to DexJarBuildPath." am: 5539e7b568 am: 0852ac9a6d am: abbe8875b3 am: 9d8513354c am: 1b4e87c465 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324492

Change-Id: I833abaca598dc05ae4c7f0652b329801555faee9
 2020-06-05 02:23:00 +00:00
Ulyana Trafimovich
abbe8875b3 Revert^2 "Rename DexJar interface method to DexJarBuildPath." am: 5539e7b568 am: 0852ac9a6d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324492

Change-Id: I75dc93bb6aac621a0d90e5c5051cdeab98f5d1ef
 2020-06-05 01:29:34 +00:00
Ulyana Trafimovich
5539e7b568 Revert^2 "Rename DexJar interface method to DexJarBuildPath." 
This reverts commit b0dc851ff4.

Reason for revert: relanding original change. Build failures were
  caused by a race with another CL: https://r.android.com/1320920

Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: Ic9016582dae7773b4d4f84a63425f1ef7a5d061f
 2020-06-04 17:20:38 +01:00
Ulyana Trafimovich
f6b7c5199e Merge "Revert "Rename DexJar interface method to DexJarBuildPath."" am: c55b679e7b am: 651a63ca9d am: 7e59e8e2df am: de5e9d46ab am: df2e88d269 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324371

Change-Id: I4bd4f0db8acbb9b8267ee3efd1b25dd878bb7f31
 2020-06-04 11:53:12 +00:00
Ulyana Trafimovich
87d88f7b13 Merge "Rename DexJar interface method to DexJarBuildPath." am: 2a08566634 am: 22cd1b5383 am: 0cc337d35a am: 719c2d237b am: 1d39f4663c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322701

Change-Id: I4341c6f61d67fa0db4b7f33cee472e4672ab4260
 2020-06-04 11:13:41 +00:00
Ulyana Trafimovich
7e59e8e2df Merge "Revert "Rename DexJar interface method to DexJarBuildPath."" am: c55b679e7b am: 651a63ca9d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324371

Change-Id: Ic3be6718aff2b04048bac17635b2858581fe7f8a
 2020-06-04 11:13:23 +00:00
Ulyana Trafimovich
c55b679e7b Merge "Revert "Rename DexJar interface method to DexJarBuildPath."" 2020-06-04 10:47:47 +00:00
Ulyana Trafimovich
b0dc851ff4 Revert "Rename DexJar interface method to DexJarBuildPath." 
This reverts commit 562c240185.

Reason for revert: breaks `lunch full-eng && m checkbuild`.

Change-Id: Id7c7d6240d98afaf8edd49b6c96cd05534b784cc
 2020-06-04 10:37:36 +00:00
Ulyana Trafimovich
0cc337d35a Merge "Rename DexJar interface method to DexJarBuildPath." am: 2a08566634 am: 22cd1b5383 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322701

Change-Id: I87a6570cc6184bb38dda1f83dac787c30d8aaa54
 2020-06-04 10:36:28 +00:00
Ulyana Trafimovich
2a08566634 Merge "Rename DexJar interface method to DexJarBuildPath." 2020-06-04 10:05:33 +00:00
Jiyong Park
2cd081cf06 dex_import can be added to apex 
Bug:157886942
Test: m
Change-Id: Ida6f7bb784efe74cc1fa0e8d370eaee803f08b0f
Merged-In: Ida6f7bb784efe74cc1fa0e8d370eaee803f08b0f
 2020-06-04 10:28:44 +01:00
Treehugger Robot
b388f5d3be Merge "dex_import can be added to apex" am: a8bf98852a am: 55110941ea am: a7f51bb3c0 am: 3631e62525 am: d546fcb48f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1320920

Change-Id: I058aa528811586fc034c9cd596a367a723f2fc5a
 2020-06-04 06:17:33 +00:00
Treehugger Robot
a7f51bb3c0 Merge "dex_import can be added to apex" am: a8bf98852a am: 55110941ea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1320920

Change-Id: I09342ecaf016ca85ab5ac5812c46af6932179258
 2020-06-04 05:38:13 +00:00
Treehugger Robot
a8bf98852a Merge "dex_import can be added to apex" 2020-06-04 05:06:22 +00:00
Ulya Trafimovich
562c240185 Rename DexJar interface method to DexJarBuildPath. 
This is a prerequisite change before adding DexJarInstallPath.

Test: lunch aosp_cf_phone-userdebug && m
Change-Id: I033e08b8bb06c0a844a6bbbfcdc48ce33e9c95cf
 2020-06-03 11:40:45 +01:00
Jaewoong Jung
fccad6b098 Soong package structure refactoring 
Give prebuilt_etc and sh_binary their own packages and split the
gigantic main Android.bp up to small, per-package ones.

(This is a cherry-pick change.)

Test: m nothing, TreeHugger
Bug: 156980228
Change-Id: I7b00cd344b9f16861f1ff39edf0029f016b853d0
Merged-In: I7b00cd344b9f16861f1ff39edf0029f016b853d0
 2020-06-02 14:35:04 -07:00
Jaewoong Jung
6086b17692 Merge "Soong package structure refactoring" am: 264700345d am: ca9ed9158d am: 8066ebc38f am: 358710d97a am: 11f1b395ba 
Original change: undetermined

Change-Id: Iff17c41bbd2b284c4b348b10855794fd33562264
 2020-06-02 17:52:04 +00:00
Jaewoong Jung
8066ebc38f Merge "Soong package structure refactoring" am: 264700345d am: ca9ed9158d 
Original change: undetermined

Change-Id: I5cd95c02ab8af420dc2b7166ba24bdf0c7dc6496
 2020-06-02 16:57:16 +00:00
Jiyong Park
77acec63fe dex_import can be added to apex 
Bug:157886942
Test: m
Change-Id: Ida6f7bb784efe74cc1fa0e8d370eaee803f08b0f
 2020-06-02 11:54:01 +09:00
Jaewoong Jung
4b79e98a6e Soong package structure refactoring 
Give prebuilt_etc and sh_binary their own packages and split the
gigantic main Android.bp up to small, per-package ones.

Test: m nothing, TreeHugger
Bug: 156980228
Change-Id: I7b00cd344b9f16861f1ff39edf0029f016b853d0
 2020-06-01 13:44:48 -07:00
Jiyong Park
e2bdd3bfbb Merge "Use Stem where output file name is expected in APEX" am: 0e666433cd am: 611703096e am: 7a12fd11ee am: 0701382a9c am: 9cb9bb1db4 
Change-Id: I6ff373f935384ffe767c0496bd92239f5028170f
 2020-06-01 01:41:40 +00:00
Jiyong Park
7a12fd11ee Merge "Use Stem where output file name is expected in APEX" am: 0e666433cd am: 611703096e 
Change-Id: I94d8f5541deea86310ad3b249b670c61623f3b96
 2020-06-01 01:02:03 +00:00
Jiyong Park
cbe50c7073 Use Stem where output file name is expected in APEX 
Bug: 157638999
Test: m
Merged-In: I4a4892bc2941cf1301d210fc3107c02f0e7b13b7
(cherry picked from commit f1493cc0f2)
Change-Id: I4a4892bc2941cf1301d210fc3107c02f0e7b13b7
 2020-05-30 21:15:24 +09:00
Jiyong Park
f1493cc0f2 Use Stem where output file name is expected in APEX 
Bug: 157638999
Test: m
Change-Id: I4a4892bc2941cf1301d210fc3107c02f0e7b13b7
 2020-05-30 13:26:55 +09:00
Jiyong Park
ed50ca8dd8 apex respects stem of java_library modules 
apex now respects stem of java_library modules.

As a follow-up we need to suppor the same for other types of modules.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 157638999
Test: m
Merged-In: Iaf5023020b5440f1ffd4f5414b5a7864655fc22a
(cherry picked from commit a62aa23990)
Change-Id: Iaf5023020b5440f1ffd4f5414b5a7864655fc22a
 2020-05-29 14:15:36 +09:00
Treehugger Robot
d7aceaf4cd Merge "apex respects stem of java_library modules" am: 00f5701ade am: 3013ea064f am: db1bd15ef0 am: 16db9832c9 am: 137b4cf81f 
Change-Id: Iea14cfe25ac11c7a7f85cb3141c1b8d8064e5321
 2020-05-29 02:13:54 +00:00
Treehugger Robot
db1bd15ef0 Merge "apex respects stem of java_library modules" am: 00f5701ade am: 3013ea064f 
Change-Id: I40a1a6803d8af53a7889b8986f59fbafd4d13ee1
 2020-05-29 01:17:33 +00:00
Jiyong Park
a62aa23990 apex respects stem of java_library modules 
apex now respects stem of java_library modules.

As a follow-up we need to suppor the same for other types of modules.

Bug: 157638999
Test: m
Change-Id: Iaf5023020b5440f1ffd4f5414b5a7864655fc22a
 2020-05-28 23:48:16 +09:00
Jiyong Park
b51e7ea3b8 Remove apex_available whitelist for the ART APEX 
The marked library(ies) were available to the APEX via the
hand-written whitelist in build/soong/apex/apex.go. Trying to remove the
whitelist by adding apex_available property to the Android.bp of the
libraries.

Exempt-From-Owner-Approval: cherry-pick from internal

Bug: 150999716
Test: m
Merged-In: I2b792657b444f0c963e1e92b7c91f6a0cfe1688c
(cherry picked from commit be6e2b6a18)
Change-Id: I2b792657b444f0c963e1e92b7c91f6a0cfe1688c
 2020-05-28 04:06:41 +00:00
Jiyong Park
2deda01498 Merge changes from topic "apex_available_art" into rvc-dev am: b7431abffe am: 69efc4625a am: 9962279600 am: c2feb5162f 
Change-Id: I1a4c750303ab4ecfa816d7327f7e2461a43cd6c6
 2020-05-28 01:59:55 +00:00
Jiyong Park
69efc4625a Merge changes from topic "apex_available_art" into rvc-dev am: b7431abffe 
Change-Id: Idb9f30b74687f2c5da9494db60ae6614a67c0c4b
 2020-05-28 01:11:19 +00:00
Jiyong Park
885910e198 DO NOT MERGE: Revert "DO NOT MERGE: Remove AppSearch from Android R." am: 8b39919030 
Change-Id: If72ac03ec041b30dc2636ba5412c375ac1566ca4
 2020-05-28 01:11:17 +00:00
Jiyong Park
b7431abffe Merge changes from topic "apex_available_art" into rvc-dev 
* changes:
  Remove apex_available whitelist for the ART APEX
  DO NOT MERGE: Revert "DO NOT MERGE: Remove AppSearch from Android R."
 2020-05-28 00:49:45 +00:00
Artur Satayev
07d215215b Merge changes I4ab7e1a3,Ib525b2f5,I2d4c54fb into rvc-dev 
* changes:
  Generate combined deps-info for all updatable modules.
  Remove ApexBundleDepsInfo.MinSdkVersion()
  Add "updatable" property to ApexModule interface.
 2020-05-27 20:58:27 +00:00
Artur Satayev
2b4b7bbe82 Generate combined deps-info for all updatable modules. 
Introduce a singleton apex rule to merge contents of individual
deps-info results into a single output file.

Bug: 149622332
Test: m
Change-Id: I4ab7e1a3527fead97a81a5a2cb0e1e93a429117c
Merged-In: I4ab7e1a3527fead97a81a5a2cb0e1e93a429117c
Exempt-From-Owner-Approval: cp from aosp
(cherry picked from commit 849f844252)
 2020-05-27 17:51:18 +01:00