StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,416 Commits 1 Branch 0 Tags
d3ab9dfb51f2a965bb63887d3f074d41c4c46ee0
Commit Graph

28743 Commits

Author SHA1 Message Date
Martin Stjernholm
2d6bfdb30c Fix typo in MODULE_BUILD_FROM_SOURCE variable. 
Test: env MODULE_BUILD_FROM_SOURCE=true \
        TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false
Bug: 191978129
Change-Id: I2056b198bc0b944a6736ff21077b902df13c1479
 2021-07-15 16:15:04 +01:00
Treehugger Robot
d622e08647 Merge "dexpreopt.config should be created even though unbundled image is built" am: e01cfe4896 am: 10b90baa51 
Original change: https://android-review.googlesource.com/c/platform/build/+/1730113

Change-Id: I54f082381d01c57d5fed3be25fdf764ff58431ce
 2021-07-15 09:28:41 +00:00
Treehugger Robot
e01cfe4896 Merge "dexpreopt.config should be created even though unbundled image is built" 2021-07-15 03:41:30 +00:00
Android Build Coastguard Worker
b6372a8683 Make change and version bump to SP1A.210715.001 
Change-Id: I0d429ee625ac70694ae3264da39ceaf7da62d90b
 2021-07-15 01:18:44 +00:00
Martin Stjernholm
3a52c4f4fd Build the ART module from source if other Mainline modules are. 
Cherry-picked from http://ag/15277370.

Test: env MODULES_BUILD_FROM_SOURCE=true \
        TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false
Bug: 191978129
Change-Id: I718d3878e9d5f5e710fa3d835a209184b633af48
Merged-In: I718d3878e9d5f5e710fa3d835a209184b633af48
 2021-07-14 21:02:10 +01:00
David Gross
74e7f990ac Merge "Fix bitrot: RSTest_CompatLib[19] tests stopped building" am: 304da3988d am: 29e8a85b4e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1761125

Change-Id: I122676fb7a0f5eb6ae608ee02ff1648c85b3c1ef
 2021-07-14 19:07:43 +00:00
Martin Stjernholm
492c8514c9 Build the ART module from source if other Mainline modules are. am: 06a7034659 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15277370

Change-Id: I9ec4b63142653d1ec68d836729898256942bad89
 2021-07-14 18:47:31 +00:00
David Gross
304da3988d Merge "Fix bitrot: RSTest_CompatLib[19] tests stopped building" 2021-07-14 18:34:58 +00:00
Jeongik Cha
b26bf58e12 dexpreopt.config should be created even though unbundled image is built 
Bug: 188179858
Test: compare dexpreopt_config.zip files from
 1. TARGET_BUILD_UNBUNDLED_IMAGE=true m dexpreopt_config_zip
 2. m dexpreopt_config_zip
(note that m clean should run between steps)

Change-Id: I92623b59e4fcac397c7fed3d7ab1070fe5281027
 2021-07-14 18:52:01 +09:00
Android Build Coastguard Worker
f8db5a6c1e Make change and version bump to SP1A.210714.001 
Change-Id: I5e3edf40276957f703fdc3e2cb823726c4e1b8b9
 2021-07-14 01:20:47 +00:00
Martin Stjernholm
06a7034659 Build the ART module from source if other Mainline modules are. 
Test: env MODULES_BUILD_FROM_SOURCE=true \
        TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false
Bug: 191978129
Change-Id: I718d3878e9d5f5e710fa3d835a209184b633af48
 2021-07-13 23:56:55 +01:00
Alexander Smundak
0b56290fbc Merge "Add mkpatsubst" am: 4b8d81b41c am: 5f8eba778e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1764007

Change-Id: Ic185cdc7fa3ab3c3f7852bcac9065e4164e6a951
 2021-07-13 22:36:50 +00:00
Alexander Smundak
4b8d81b41c Merge "Add mkpatsubst" 2021-07-13 22:11:03 +00:00
Treehugger Robot
a42ea23d40 Merge "Remove pre-aidegen IDE support logic" am: 818e6c0579 am: 55ac7fd6d0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1764131

Change-Id: Ia69e9aac511ed9a40c28d453f3abf2bd0cb2c490
 2021-07-13 17:01:00 +00:00
Treehugger Robot
818e6c0579 Merge "Remove pre-aidegen IDE support logic" 2021-07-13 16:32:16 +00:00
Sasha Smundak
3b25eb1c98 Add mkpatsubst 
Bug: 181797530
Test: rbcrun build/make/tests/run.rbc
Change-Id: Id15daaf6e3ed68982e50cdc710563095ffcf57ba
 2021-07-13 09:21:07 -07:00
Dan Willemsen
b349e4e04a Remove pre-aidegen IDE support logic 
This has apparently been racy ever since
https://android-review.googlesource.com/c/platform/build/+/971925
and isn't generally useful anymore, as aidegen has taken over.

Bug: 193095826
Test: treehugger
Change-Id: I09b6b340b84d1476a574b302db520210561a4e5e
 2021-07-12 21:57:33 -07:00
Android Build Coastguard Worker
f9b5ab3317 Make change and version bump to SP1A.210713.001 
Change-Id: I14140584f9c6a482bf4b2886add86d70f61375a9
 2021-07-13 01:20:27 +00:00
Bill Yi
827998ad08 Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" 2021-07-13 00:48:38 +00:00
Treehugger Robot
a752950eb8 Merge "Add mksubst" am: cfaa04b92a am: d976d4cb82 
Original change: https://android-review.googlesource.com/c/platform/build/+/1760830

Change-Id: Ibff9759cca42d31b46ff92065908650db138062a
 2021-07-12 23:53:24 +00:00
Treehugger Robot
d976d4cb82 Merge "Add mksubst" am: cfaa04b92a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1760830

Change-Id: Ibffa8fe6fa3f21e5de87a13c8289ec9b739096bf
 2021-07-12 23:40:49 +00:00
Sasha Smundak
9afdb1c92a Add mksubst 
Bug: 181797530
Test: rbcrun build/make/tests/run.rbc
Change-Id: I196c69259b830b6466430f6c933afb49fa787948
 2021-07-12 13:36:13 -07:00
Bill Yi
80ce9b7379 Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE 
Merged-In: I0e49d49a8bddfbe8eceaa6ec46a08fee2ca4f105
Merged-In: If961d5fbf795ad5ef4b2f4ac4707087c5021e53f
Merged-In: If961d5fbf795ad5ef4b2f4ac4707087c5021e53f
Change-Id: Ia06e2825a3a0f9ccec2666132732c80d07a9a5ea
 2021-07-12 11:11:14 -07:00
Android Build Coastguard Worker
1ea46a571b Version bump to SP1A.210712.002 [core/build_id.mk] 
Change-Id: Id560ce378f6502f32e26270fc585f536e8f49ae0
 2021-07-12 17:39:39 +00:00
Martin Stjernholm
3e3cf73b5a Merge changes I544a0cfc,I8990b726 am: 37557784fd 
Original change: https://android-review.googlesource.com/c/platform/build/+/1760315

Change-Id: I1ae56ea55e2d269a5317875e42f39654298203fb
 2021-07-12 14:07:38 +00:00
Martin Stjernholm
f8253e7130 Force building ART from source for AOSP products. am: a877393386 
Original change: https://android-review.googlesource.com/c/platform/build/+/1760316

Change-Id: I265e0c7720d4ad51c1d2ed94e83dfd2cc45f783e
 2021-07-12 14:07:36 +00:00
Martin Stjernholm
37557784fd Merge changes I544a0cfc,I8990b726 
* changes:
  Add special cases for builds that cannot switch to ART prebuilts.
  Force building ART from source for AOSP products.
 2021-07-12 13:51:23 +00:00
Bill Yi
c87428a97e Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE 
Merged-In: If961d5fbf795ad5ef4b2f4ac4707087c5021e53f
Merged-In: Ia4ed6e4c14be1d4e636e976a77cbdc0342a398de
Change-Id: Iff4b0753e7ab477d4491885ef1458a5b1efd82e5
 2021-07-11 22:47:30 -07:00
Android Build Coastguard Worker
861faed218 Make change and version bump to SP1A.210712.001 
Change-Id: I88f8555752e601420a9877c61b20bd5a5ae3df06
 2021-07-11 23:19:18 +00:00
Android Build Coastguard Worker
1c32ba062f Make change and version bump to SP1A.210711.001 
Change-Id: Idec1cbb813cef34a31b141b33fb1db715ba63c53
 2021-07-10 23:23:29 +00:00
Android Build Coastguard Worker
29b813b5e8 Make change and version bump to SP1A.210710.001 
Change-Id: Ia0dc022df366497599adfcee2305e21680a21fbc
 2021-07-10 03:24:30 +00:00
Treehugger Robot
d4c8d8929a Merge "Add mkstrip" am: 91bb0d9e33 am: 67074097a7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1734212

Change-Id: Ia4ed6e4c14be1d4e636e976a77cbdc0342a398de
 2021-07-09 23:42:29 +00:00
Android Build Coastguard Worker
c982ce9c84 Version bump to SP1A.210709.002 [core/build_id.mk] 
Change-Id: Ibcf14892a87628be1d61ac60b409a8a77f3805ad
 2021-07-09 20:51:52 +00:00
Martin Stjernholm
75b8f0a469 Add special cases for builds that cannot switch to ART prebuilts. 
Cherry-picked from http://ag/15234811.

Test: env TARGET_PRODUCT=mainline_modules_x86_64 \
        build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812 in internal
Test: env TARGET_PRODUCT=module_arm build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Test: env TARGET_PRODUCT=cf_arm64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812 in internal
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false with http://ag/15234812 in internal
Test: env TARGET_PRODUCT=cf_x86_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false with http://ag/15234812 in internal
Test: env TARGET_PRODUCT=bonito build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false with http://ag/15234812 in internal
Test: env TARGET_PRODUCT=aosp_flame build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Bug: 172480615
Change-Id: I544a0cfc9dfe6d738f75e60b7fec6d57f2b51d22
Merged-In: I544a0cfc9dfe6d738f75e60b7fec6d57f2b51d22
 2021-07-09 19:30:01 +01:00
Martin Stjernholm
a877393386 Force building ART from source for AOSP products. 
This is a workaround for the problem that we cannot control from make
which APEX gets picked for deapexing.

Cherry-picked from http://ag/15107826.

Test: env TARGET_PRODUCT=aosp_cf_x86_64_phone \
          SOONG_CONFIG_art_module_source_build=false \
        build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  This shows true
Test: env TARGET_PRODUCT=cf_x86_64_phone \
          SOONG_CONFIG_art_module_source_build=false \
        build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  This shows false in internal
Bug: 192006406
Bug: 172480615
Change-Id: I8990b726affeb08eabf130d20be45129a7c1c58d
Merged-In: I8990b726affeb08eabf130d20be45129a7c1c58d
 2021-07-09 19:29:48 +01:00
Sasha Smundak
be4ebca4ba Add mkstrip 
Bug: 181797530
Test: rbcrun build/make/tests/run.rbc
Change-Id: I6b7ade400273cf5a4fd561322e8e9936bc9d8df6
 2021-07-09 10:44:22 -07:00
Martin Stjernholm
29502219df DO NOT MERGE: Use prebuilts of the ART Module by default (reland 2). am: f68bd2db71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15234812

Change-Id: I166332a4456741bd3851e9058e05e85926b771d9
 2021-07-09 12:06:48 +00:00
Martin Stjernholm
35cd36f38c Add special cases for builds that cannot switch to ART prebuilts. am: fa089f76e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15234811

Change-Id: I1ae6e8f80b21014467e47876d5ee0add2a13bad4
 2021-07-09 12:06:43 +00:00
Treehugger Robot
7388ed30aa Merge "Imply ALLOW_MISSING_DEPENDENCIES for Mac builds" am: 42b072f4a7 am: f19de55328 
Original change: https://android-review.googlesource.com/c/platform/build/+/1760965

Change-Id: Ib8393cc70ffa9e5cda7035fd67878287180cdfed
 2021-07-09 01:56:02 +00:00
Android Build Coastguard Worker
c9f1d2fa1c Make change and version bump to SP1A.210709.001 
Change-Id: Ie6bc38478e3a5a7199e3f60c30f6f10169bb80bb
 2021-07-09 01:29:16 +00:00
David Gross
dd400c3af1 Fix bitrot: RSTest_CompatLib[19] tests stopped building 
(1) Incorrect path to librsjni.so because of typo in earlier change;
    fixed by fixing typo.

(2) clang did not specify the target architecture (I don't know what
    changed so that this no longer works); fixed by specifying target
    architecture and changing from gcc linker to lld (gcc linker didn't
    understand the options it was being passed by clang).

Test: blueline-userdebug
Test: make -j FORCE_BUILD_RS_COMPAT=true ENABLE_RSTESTS=true \
        RSTestForward_21_1_2 RSTestForward_22_0_2 \
        RSTestForward_23_0_3 RSTestForward_24_0_3 RSTestForward_25_0_2 \
        RSTestBackward RSTestBackward19 RSTest RSTest_Compat RSTest_Compat19
Test: unzip -t ${PATH_TO_APK}
      # confirm that .so files are present in RSTest_Compat[19] but not
        for the other APKs
      # confirm that .bc files are present in RSTestBackward19 but not
        for the other APKs
Test: adb shell am instrument [--abi armeabi-v7a] \
        -w ${TEST_PACKAGE_NAME}/androidx.test.runner.AndroidJUnitRunner
      # Run four times:
      #   "--abi" argument present or absent; always omit for
      #     RSTest_Compat[19], which only support platform default ABI
      #   "adb shell setprop debug.rs.forcecompat 0" or "1"
      # Note that RSTestBackward19 only supports 32-bit ABI, so both
      #   runs (with and without "--abi" argument) are actually armeabi-v7a
Test: After run, check logcat for RenderScript_jni
      # (missing): not built against support library; expected for all
        tests except RSTest_Compat[19]
      # "RenderScript_jni: RS native mode"; expected for RSTest_Compat[19]
        when setprop debug.rs.forcecompat is 0
      # "RenderScript_jni: RS compat mode"; expected for RSTest_Compat[19]
        when setprop debug.rs.forcecompat is 1

Change-Id: Icfaa226f2e1bfa909cb3bcbbe960f2804c355d2a
 2021-07-08 17:01:43 -07:00
Martin Stjernholm
743513c830 Document how APEXes are identified in the boot jar variables. 
Test: n/a - comment changes only
Bug: 191269918
Change-Id: Ib82ee24be13274051590be5e207883e4fbc9e6ae
 2021-07-08 23:24:09 +01:00
Dan Willemsen
fd224efb7f Imply ALLOW_MISSING_DEPENDENCIES for Mac builds 
At least until the device builds are largely disabled and host builds
become opt-in rather than opt-out. Otherwise every host test that
depends on a linux-only library breaks the mac build, even if it won't
be used.

Bug: 187222815
Change-Id: Ic598f2b66a949b90e5b3fbebf463f28278e4834f
 2021-07-08 14:26:03 -07:00
Android Build Coastguard Worker
ac054bc16d Version bump to SP1A.210708.002 [core/build_id.mk] 
Change-Id: I3b11ee9a03929cf1cec0848d65d81dbbc6d305e8
 2021-07-08 21:12:12 +00:00
Martin Stjernholm
f68bd2db71 DO NOT MERGE: Use prebuilts of the ART Module by default (reland 2). 
This means prebuilts located in
/vendor/unbundled_google/modules/ArtGooglePrebuilt and
/prebuilts/module_sdk/art are used instead of sources in /art,
/libcore, and /libnativehelper.

Sanitizer and coverage builds builds are excluded, as are builds using
the products art_module_*, armv8, arm_krait, and others in
device/generic/art.

To keep using ART and libcore sources in local builds, set
SOONG_CONFIG_art_module_source_build=true. See art/build/README.md for
further info.

This http://ag/15200786 after fixing various build issues (see tests).
Using DO NOT MERGE to limit presubmit use to the branches for which
prebuilts were updated in http://ag/15189174 and http://ag/15200785.

Test: Heavy presubmits on build_test{,2,3,4} and flame-userdebug
Test: Heavy presubmit on mainline_modules-userdebug on sc-mainline-prod
Bug: 192542393
Change-Id: Id6800fe3564149e6c555b5f68a41b01e9c7dff3f
 2021-07-08 16:16:33 +01:00
Martin Stjernholm
fa089f76e6 Add special cases for builds that cannot switch to ART prebuilts. 
Test: env TARGET_PRODUCT=mainline_modules_x86_64 \
        build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Test: env TARGET_PRODUCT=module_arm build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Test: env TARGET_PRODUCT=cf_arm64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Test: env TARGET_PRODUCT=sdk_g3titan_x86_64 build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false with http://ag/15234812
Test: env TARGET_PRODUCT=cf_x86_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false with http://ag/15234812
Test: env TARGET_PRODUCT=bonito build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false with http://ag/15234812
Test: env TARGET_PRODUCT=aosp_flame build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Bug: 192542393
Change-Id: I544a0cfc9dfe6d738f75e60b7fec6d57f2b51d22
 2021-07-08 16:16:14 +01:00
Android Build Coastguard Worker
6f9c1ee52f Make change and version bump to SP1A.210708.001 
Change-Id: I10658ff2141c666d60d630d9927b6fe76951af80
 2021-07-08 01:29:47 +00:00
Bill Peckham
87ae77f7ef Merge "Break dependency from droid_targets to blueprint_tools" am: 61de59bc36 am: a897b876e7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1754798

Change-Id: I313be134662bf05da0efe835681ca3c32ff6112d
 2021-07-07 20:39:51 +00:00
Mohammad Samiul Islam
66387deaa8 Revert "DO NOT MERGE: Use prebuilts of the ART Module by default (reland)." am: 5031d7f844 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15217854

Change-Id: Iea53b2cd19158742cd67c6aead556e09b1304b73
 2021-07-07 14:46:44 +00:00
Mohammad Samiul Islam
ddfa249778 Merge "Revert "DO NOT MERGE: Use prebuilts of the ART Module by default (reland)."" into sc-dev 2021-07-07 14:36:20 +00:00