StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,870 Commits 1 Branch 0 Tags
dba1360d03abd66a3396442110e2b1e9fbcb6d99
Commit Graph

22870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
342b4810a7 Merge "Allow apex module to have android_app_set as its constituent." am: a5c94e1409 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1318079

Change-Id: I25334b15ac92c1635b6d35cc2c217543b575aeed
 2020-06-05 06:09:05 +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
Inseob Kim
5f789d7b91 Merge changes I059e639b,I4ebe1da8,Idf4fd37a,Id90082b5 into rvc-dev am: 2743c1def6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11698189

Change-Id: I62157287035bee39b902421c37cdd7e3213a6222
 2020-06-05 04:15:27 +00:00
Inseob Kim
2743c1def6 Merge changes I059e639b,I4ebe1da8,Idf4fd37a,Id90082b5 into rvc-dev 
* changes:
  Do not disable llndk libraries
  Create only one vendor variant depending on path
  Implement cc_object vendor snapshot
  Refine logic choosing vendor snapshot modules
 2020-06-05 04:02:35 +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
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
0852ac9a6d Revert^2 "Rename DexJar interface method to DexJarBuildPath." am: 5539e7b568 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324492

Change-Id: Id3edb3878f1e2001c7de883ddff0f48157520595
 2020-06-05 01:16:04 +00:00
Jaewoong Jung
9985c8cdb2 [automerger skipped] Merge "Soong package structure refactoring" into rvc-dev am: 30167e8003 -s ours 
am skip reason: Change-Id I7b00cd344b9f16861f1ff39edf0029f016b853d0 with SHA-1 4b79e98a6e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11709657

Change-Id: If6182a6e025039c30cc7056d5e34f434000d3d68
 2020-06-04 17:02:30 +00:00
Jaewoong Jung
30167e8003 Merge "Soong package structure refactoring" into rvc-dev 2020-06-04 16:48:42 +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
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
651a63ca9d Merge "Revert "Rename DexJar interface method to DexJarBuildPath."" am: c55b679e7b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324371

Change-Id: Ia2202f5363faa713d6ad21e529f66c25d40029c9
 2020-06-04 11:02:49 +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
22cd1b5383 Merge "Rename DexJar interface method to DexJarBuildPath." am: 2a08566634 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322701

Change-Id: I78f0f186eeb3e4a2014c9cd18dc06185f7a29974
 2020-06-04 10:16:15 +00:00
Ulyana Trafimovich
2a08566634 Merge "Rename DexJar interface method to DexJarBuildPath." 2020-06-04 10:05:33 +00:00
Ulyana Trafimovich
317cc83ebb Merge "Error on suboptimal system server classpath order, unless explicitly allowed." am: eb3f9f1295 am: 515534ed9d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322708

Change-Id: Id4849079a3d7b15d861b24a98761fe2a9b6ccd94
 2020-06-04 09:20:58 +00:00
Ulyana Trafimovich
515534ed9d Merge "Error on suboptimal system server classpath order, unless explicitly allowed." am: eb3f9f1295 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322708

Change-Id: I06cbcb2620db54f047abf7661387685785de584b
 2020-06-04 09:04:19 +00:00
Ulyana Trafimovich
eb3f9f1295 Merge "Error on suboptimal system server classpath order, unless explicitly allowed." 2020-06-04 08:56:04 +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
55110941ea Merge "dex_import can be added to apex" am: a8bf98852a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1320920

Change-Id: I53fd8b961fba5ec095387d3d45ff450823b9ee73
 2020-06-04 05:20:39 +00:00
Treehugger Robot
a8bf98852a Merge "dex_import can be added to apex" 2020-06-04 05:06:22 +00:00
Tej Singh
7fbc603f89 [automerger skipped] Revert "Always run package check" am: 8383972ec0 -s ours 
am skip reason: Change-Id I50af71d54d5f1f8b516bfcf1efbcf6217e89c83a with SHA-1 b549b77120 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11722213

Change-Id: Ic8e6eb20954c895c96ceaba09d92f6e83665438a
 2020-06-03 22:41:27 +00:00
Tej Singh
8383972ec0 Revert "Always run package check" 
This reverts commit aa7359ab0c.

Reason for revert: package-check.sh doesn't work on mac

Change-Id: Ia3dcee612c1f6b4121e1351c8710638ae41bc88a
Merged-In: I50af71d54d5f1f8b516bfcf1efbcf6217e89c83a
 2020-06-03 18:45:54 +00:00
Colin Cross
d89338653f Merge "Revert "Always run package check"" am: 3747336d23 am: 2f0963ecd3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323293

Change-Id: I3592365b63fab1597b2a41aafaa68e49d6f1e0f2
 2020-06-03 17:56:14 +00:00
Colin Cross
2f0963ecd3 Merge "Revert "Always run package check"" am: 3747336d23 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323293

Change-Id: I4c17b88a3e2cd6d089ed2f8ea9e2592b9713ad1c
 2020-06-03 17:31:13 +00:00
Colin Cross
3747336d23 Merge "Revert "Always run package check"" 2020-06-03 17:15:51 +00:00
Colin Cross
b549b77120 Revert "Always run package check" 
This reverts commit 91206d9ed1.

Reason for revert: package-check.sh doesn't work on mac
Bug: 158081251
Bug: 157649935
Change-Id: I50af71d54d5f1f8b516bfcf1efbcf6217e89c83a
 2020-06-03 17:15:15 +00:00
Ulya Trafimovich
cd3203fd5d Error on suboptimal system server classpath order, unless explicitly allowed. 
The order is non-optimal if some jar X precedes its dependency Y. In
that case dexpreopt will be unable to resolve any rerefences from X to
Y. Raise an error unless the product sets variable
PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS to true in the
makefile. This is to prevent regressions in existing products that
currently have correct order.

Test: lunch cf_x86_phone-userdebug && m nothing
Test: lunch aosp_car_arm && m nothing

Bug: 140451054

Change-Id: Iafe8fe0e992deb628e38f2321d4601a4804a3c79
Merged-In: Iafe8fe0e992deb628e38f2321d4601a4804a3c79
(cherry picked from commit fb863c87c4)
 2020-06-03 17:37:34 +01: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
Orion Hodson
942feab5f1 [automerger skipped] Merge "Add some app modules to the allowed whitelist." am: 4a19d08d39 am: 46b02790a6 -s ours 
am skip reason: Change-Id Ia7adf690cd6dca1408ae0a340860eaeae6c1d4b4 with SHA-1 555760552b is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1290961

Change-Id: I49475cdb9416b0fc5fc4d508bd205fd641bbe199
 2020-06-03 08:08:06 +00:00
Orion Hodson
46b02790a6 Merge "Add some app modules to the allowed whitelist." am: 4a19d08d39 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1290961

Change-Id: I3823854f5782ced6c19ceb3eeb3df03ea117f17f
 2020-06-03 07:55:27 +00:00
Orion Hodson
4a19d08d39 Merge "Add some app modules to the allowed whitelist." 2020-06-03 07:29:51 +00:00
Inseob Kim
470b4cf826 Do not disable llndk libraries 
LLNDK libraries shouldn't be disabled in any case.

Bug: 157106227
Test: m
Change-Id: I059e639b21d0edb8abc00773891d37e890a36cce
 2020-06-03 15:50:07 +09:00
Inseob Kim
af578ffacc Create only one vendor variant depending on path 
Not all vendor modules are meant to be working with multiple versions of
vndk unmodified. This restricts all vendor or vendor_available modules
to only one variant. Modules under proprietary directories will only
have BOARD_VNDK_VERSION variant, while modules under AOSP directories
will only have PLATFORM_VNDK_VERSION variant.

Bug: 157106227
Bug: 157133296
Test: capture snapshot from R
Test: try building master with R snapshot
Change-Id: I4ebe1da8d887cd76722fa8ab5ae9305da09074d4
 2020-06-03 15:32:44 +09:00
Paul Duffin
1c1ae70a9b [automerger skipped] Always run package check am: aa7359ab0c -s ours 
am skip reason: Change-Id Ib01aa09e13f80282218049270eb7a58ec5f9f605 with SHA-1 91206d9ed1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11705585

Change-Id: Ie637265dc7522c8472348e681aebf53575ab1662
 2020-06-03 00:51:54 +00: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
8066ebc38f Merge "Soong package structure refactoring" am: 264700345d am: ca9ed9158d 
Original change: undetermined

Change-Id: I5cd95c02ab8af420dc2b7166ba24bdf0c7dc6496
 2020-06-02 16:57:16 +00:00
Jaewoong Jung
ca9ed9158d Merge "Soong package structure refactoring" am: 264700345d 
Original change: undetermined

Change-Id: I2b482006094cf5f2a5037177f78edf649386f78b
 2020-06-02 16:45:48 +00:00
Jaewoong Jung
264700345d Merge "Soong package structure refactoring" 2020-06-02 16:30:50 +00:00
Treehugger Robot
68e90ef846 Merge "Copy removed.txt file to the snapshot correctly" am: b47ab4b79f am: 8fc769dd85 
Original change: undetermined

Change-Id: I5846b5bd6c7c470d4732d49a90ff800b35975e7b
 2020-06-02 16:09:42 +00:00
Treehugger Robot
8fc769dd85 Merge "Copy removed.txt file to the snapshot correctly" am: b47ab4b79f 
Original change: undetermined

Change-Id: If04cb2450ee42cfe97dfab3511726ceb6c397c89
 2020-06-02 15:52:09 +00:00
Treehugger Robot
b47ab4b79f Merge "Copy removed.txt file to the snapshot correctly" 2020-06-02 15:36:39 +00:00
Ulyana Trafimovich
12d342de36 Merge "Clean up class loader context generation." am: 5af1e93993 am: 5282305767 
Original change: undetermined

Change-Id: Ide3cc6912373d4b39dcd029731b3f30855c8a8bc
 2020-06-02 14:46:19 +00:00
Inseob Kim
502679e061 Implement cc_object vendor snapshot 
cc_object modules are also necessary for vendor snapshot.

Bug: 157106227
Test: m vendor-snapshot
Change-Id: Idf4fd37a26f6f712f3cbab43133622f9f9bd9372
 2020-06-02 14:43:06 +00:00
Inseob Kim
4d8d8fec4a Refine logic choosing vendor snapshot modules 
This refines the vendor snapshot codes in order to fix logic errors.

- Capture toolchain_library and cc_library_headers correctly.
- Redirect unwind static library correctly.
- Filter out sanitize / coverage / lto by looking at HideFromMake.
- Add binary() function for clear and shorter codes.
- Include test modules.
- Add more tests to prevent further snapshot breakages.

Bug: 157106227
Test: m vendor-snapshot
Test: m nothing for all available targets
Test: EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true \
NATIVE_COVERAGE=true COVERAGE_PATHS="*" m nothing

Change-Id: Id90082b5ab730f928582ad24f022ba410855400e
 2020-06-02 23:31:58 +09:00
Ulyana Trafimovich
5282305767 Merge "Clean up class loader context generation." am: 5af1e93993 
Original change: undetermined

Change-Id: Id56144f63a8f1400b20190aca44cc67b736d64c7
 2020-06-02 14:23:02 +00:00
Ulyana Trafimovich
5af1e93993 Merge "Clean up class loader context generation." 2020-06-02 14:13:43 +00:00