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

22886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liz Kammer
aff0a39c77 Merge "Use aapt2 flag --rename-resources-package in soong" into rvc-dev-plus-aosp 2020-06-05 15:16:59 +00:00
Treehugger Robot
83b56c34b4 Merge "Remove implict jni.h include path" am: 2ebae3e936 am: a06b9185a8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1316577

Change-Id: I60571a191a651afee54a23057fa92c1470ae1dce
 2020-06-05 13:49:52 +00:00
Treehugger Robot
a06b9185a8 Merge "Remove implict jni.h include path" am: 2ebae3e936 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1316577

Change-Id: I2f224cf67f0ea8f12f82281d5185f8baa684172d
 2020-06-05 13:38:17 +00:00
Treehugger Robot
2ebae3e936 Merge "Remove implict jni.h include path" 2020-06-05 13:26:32 +00:00
Ulyana Trafimovich
a90d1e1eca Merge "Refactor library path representation in dexpreopt." am: 3ef493ff91 am: 6704d57d02 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322702

Change-Id: I7d55b3f214bbe6312ee2fbc489ddf8fe939156ab
 2020-06-05 11:08:56 +00:00
Ulyana Trafimovich
6704d57d02 Merge "Refactor library path representation in dexpreopt." am: 3ef493ff91 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322702

Change-Id: I996df967b76b60a0e31cb5c1d3fc436cece6068b
 2020-06-05 10:53:49 +00:00
Ulyana Trafimovich
3ef493ff91 Merge "Refactor library path representation in dexpreopt." 2020-06-05 10:46:01 +00:00
Anton Hansson
72c2ddaf87 [automerger skipped] Merge "dex_import can be added to apex" into rvc-dev am: d7fdfd6e77 -s ours 
am skip reason: Change-Id Ida6f7bb784efe74cc1fa0e8d370eaee803f08b0f with SHA-1 77acec63fe is in history

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

Change-Id: Icfdd45873bfa1f88bfc6441d4837dff7fdde2339
 2020-06-05 10:24:48 +00:00
Anton Hansson
bcce9f24dc [automerger skipped] Merge "Use Stem where output file name is expected in APEX" into rvc-dev am: 4ecb0d6bb0 -s ours 
am skip reason: Change-Id I4a4892bc2941cf1301d210fc3107c02f0e7b13b7 with SHA-1 f1493cc0f2 is in history

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

Change-Id: Iee7cfcf0059dc63a936baf9ef81f1fb5f624a85a
 2020-06-05 10:24:45 +00: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
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
Ulya Trafimovich
d4bcea4e24 Refactor library path representation in dexpreopt. 
This is a preliminary CL before fixing on-device paths to DEX jars.
It groups together the inormation about on-host build paths and
on-device install paths to library DEX jars.

This CL changes the structure of module dexpreopt.config files
generated by the build system. Aside of that, no functional changes.

Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: I059654be7670f2ba66248d9c49b9694a0591f9c1
 2020-06-04 17:37:42 +01: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
Orion Hodson
e68926d4d3 Remove implict jni.h include path 
Bug: 152482542
Test: m checkbuild
Change-Id: I7225646a31fb87879c47f71a1a919b342c9b488f
Merged-In: I7225646a31fb87879c47f71a1a919b342c9b488f
(cherry picked from commit 90e9505f56)
 2020-06-04 10:44:08 +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
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
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
Liz Kammer
760c335791 Use aapt2 flag --rename-resources-package in soong 
This change uses aapt2 flag to change the package name encoded in the
resources table for override apps. Runtime resource overlays will need
to be handled separately.

Test: app_test.go
Bug: 147434671
Change-Id: I70a43c2163709afc90262d74f975ce14a556cf55
 2020-06-03 21:07:02 +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