p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
70,974 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

70974 Commits

Author SHA1 Message Date
Android Build Coastguard Worker fe87b54a73 Make change and version bump to SD2A.210715.001 
Change-Id: Ia8c12764aea019e6794dfe01a21f177789ab2c8d
 2021-07-15 01:18:21 +00:00
Tianjie e7d0377f4a Write the vbmeta digest to the output zipfile also 
During signing, we write the entry directly to the output zip, intead
of a temp directory. Add the logic to write vbmeta_digest.txt to output
zipfile too. So the digest file will show up in the signed target files.

Bug: 189926233
Test: add_img_to_target_files -a <target-files.zip>
Change-Id: Ibf28a8f97512bda8c8c695e06190e1fb6573c53e
(cherry picked from commit c3bf3d00a3077b66aa178f00fb789d34a042c9e8)
 2021-07-14 16:07:33 -07:00
Martin Stjernholm 3673e6dcf1 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: Ie0da83bf73591b9c01a621dc7be8a2b9d68bc649
 2021-07-14 18:48:50 +00:00
Android Build Coastguard Worker 971679a497 Make change and version bump to SD2A.210714.001 
Change-Id: Ib33a35402c7b1c74bc75ac4a0629babda70f6fb7
 2021-07-14 01:19:10 +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
Android Build Coastguard Worker 8fab827fa1 Make change and version bump to SD2A.210713.001 
Change-Id: I7c5ffd10227bc8d64f9e03cdedde18b5e19fcc18
 2021-07-13 01:19:12 +00:00
Android Build Coastguard Worker 27c32bdefa Version bump to SD2A.210712.002 [core/build_id.mk] 
Change-Id: I3ed3f1c618a52dfff9a272a23ce8644c9bed914e
 2021-07-12 17:40:06 +00:00
Android Build Coastguard Worker f443f1d1fa Make change and version bump to SD2A.210712.001 
Change-Id: I5507066af13d053f78e03fcc20e818f509303c52
 2021-07-11 23:22:28 +00:00
Android Build Coastguard Worker e325b88c2d Make change and version bump to SD2A.210711.001 
Change-Id: Iec88521e497d34559600bcf9f6f09ee851b970c4
 2021-07-10 23:18:09 +00:00
Android Build Coastguard Worker 7c5bfd693a Make change and version bump to SD2A.210710.001 
Change-Id: Ide1b2854753bb504809cc8c030ad914fa11ba289
 2021-07-10 01:23:28 +00:00
Martin Stjernholm 1e4945f964 [automerger skipped] DO NOT MERGE: Use prebuilts of the ART Module by default (reland 2). am: f68bd2db71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60308f6512e96c1deace6b7bb65dc69ff4078ace
 2021-07-09 12:07:17 +00:00
Martin Stjernholm df1a364796 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: If0772963b01d55fd5d636271e6a95776c5bd67e0
 2021-07-09 12:07:15 +00:00
Android Build Coastguard Worker 517976109f Make change and version bump to SD2A.210709.001 
Change-Id: I3a33fb15665e6469726234848769bc520f6be5d4
 2021-07-09 01:23:41 +00:00
Android Build Coastguard Worker d695ee7b30 Version bump to SD2A.210708.002 [core/build_id.mk] 
Change-Id: I6c6f3f8649b7e76d89415899201195740ab402ae
 2021-07-08 21:10:17 +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 2fae25e523 Make change and version bump to SD2A.210708.001 
Change-Id: Ibafc90a4b8b5b22f2985fcec9e599378ac3edb20
 2021-07-08 01:27:03 +00:00
Mohammad Samiul Islam e958462d2d [automerger skipped] Merge "Revert "DO NOT MERGE: Use prebuilts of the ART Module by default (reland)."" into sc-dev am: ddfa249778 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7561389f26c759d8649b48be76418b0aa03e85cd
 2021-07-07 14:47:26 +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
Mohammad Samiul Islam 5031d7f844 Revert "DO NOT MERGE: Use prebuilts of the ART Module by default (reland)." 
This reverts commit 6a3fd20b35.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_sc-mainline-prod&target=mainline_modules-userdebug&lkgb=7528055&lkbb=7528146&fkbb=7528146, bug b/193013377

Change-Id: I896884acbb1dae20019eefeedf13494c4235a1b3
 2021-07-07 13:19:08 +00:00
Martin Stjernholm 1741913ea1 [automerger skipped] Merge "DO NOT MERGE: Use prebuilts of the ART Module by default (reland)." into sc-dev am: c9a802862f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice02a7b4b9d513955e0474f20be6c9e4518dc844
 2021-07-07 12:27:20 +00:00
Martin Stjernholm c9a802862f Merge "DO NOT MERGE: Use prebuilts of the ART Module by default (reland)." into sc-dev 2021-07-07 12:12:33 +00:00
TreeHugger Robot bc78c05c44 Merge changes from topic "revert-15071196-init_first_stage_soong-GBJXQRPEKC" into sc-dev am: 7e2e4be86c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15167736

Change-Id: Ief116239222f89dbbe6694128ce2b6287a48d335
 2021-07-07 03:24:15 +00:00
Inseob Kim b41ad31607 Revert "Directly create ramdisk dirs in ramdisk image rule" am: ef49dc6daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15167735

Change-Id: I69b885d12e9ee3cbd9879e7c7b2319252cef443b
 2021-07-07 03:24:08 +00:00
Inseob Kim f64b4d23e6 Revert "Add BUILD_USES_RECOVERY_AS_BOOT to soong config" am: e683a5fcea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15167734

Change-Id: Ib1db1b0db76e73b1f98471a8219a402d7d7d2bf7
 2021-07-07 03:24:01 +00:00
TreeHugger Robot 7e2e4be86c Merge changes from topic "revert-15071196-init_first_stage_soong-GBJXQRPEKC" into sc-dev 
* changes:
  Revert "Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars"
  Revert "Directly create ramdisk dirs in ramdisk image rule"
  Revert "Add BUILD_USES_RECOVERY_AS_BOOT to soong config"
 2021-07-07 03:02:00 +00:00
Android Build Coastguard Worker 3a8efbb7f4 Make change and version bump to SD2A.210707.001 
Change-Id: I0cba3d24b658b6c1d3199817832dad7cb0c71f92
 2021-07-07 01:18:22 +00:00
Android Build Coastguard Worker 51561d679d Make change and version bump to SD2A.210706.001 
Change-Id: Ie33714a076703e5bf80b1b5baab2f080e8eae1e3
 2021-07-06 01:20:44 +00:00
Martin Stjernholm 6a3fd20b35 DO NOT MERGE: Use prebuilts of the ART Module by default (reland). 
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 relands http://ag/13552665 after updating ART prebuilts
(ag/15189174, ag/15200785). Using DO NOT MERGE to have the same scope
as they do.

Test: presubmits
Test: vendor/google/build/build_mainline_modules.sh
  with a line
    build/soong/soong_ui.bash --dumpvar-mode \
      SOONG_CONFIG_art_module_source_build
  directly before the module build commands in
  build_unbundled_mainline_module.sh and check that it's still true.
Bug: 192542393
Change-Id: I6281ef27bf9cdcb2ad5112b8a0932e4201d69dc2
 2021-07-05 01:21:54 +01:00
Android Build Coastguard Worker 2de76d449b Make change and version bump to SD2A.210705.001 
Change-Id: Ifaa7159c1c6000742e085f0ab17ea342c4a9d787
 2021-07-04 23:18:33 +00:00
Android Build Coastguard Worker 34c24f98c3 Make change and version bump to SD2A.210704.001 
Change-Id: I2d59934c6f5f972efe76a2e0dbe557f6af2e2b50
 2021-07-03 23:23:36 +00:00
Android Build Coastguard Worker 0abde3c0b9 Make change and version bump to SD2A.210703.001 
Change-Id: I3998b5c4de0c234756e128ee62882280e01a2e2d
 2021-07-03 01:18:08 +00:00
TreeHugger Robot 48dc897e3b Merge "Delete com.android.cronet from base_system" into sc-dev am: 69f66460de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14732008

Change-Id: I65def9e6f2560bbf032438f2e1c54fb511df2813
 2021-07-02 09:18:26 +00:00
TreeHugger Robot 69f66460de Merge "Delete com.android.cronet from base_system" into sc-dev 2021-07-02 09:03:40 +00:00
Android Build Coastguard Worker 60478ba91f Make change and version bump to SD2A.210702.001 
Change-Id: Ic1c9ecee2c5e5fdd58abf41a6a276110992690e4
 2021-07-02 01:23:01 +00:00
Paul Scovanner c1aeba4401 [automerger skipped] Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f am: 28bb26cec7 -s ours am: 76530937da -s ours am: 7800a61f24 -s ours am: 22d840e154 -s ours 
am skip reason: Merged-In Icea699ec7f82744ff0a6dca90068b2737129778a with SHA-1 cfd4896dc2 is already in history

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

Change-Id: I5b55eb74c51ccd9ac677d121b95a2e819cf3729e
 2021-07-02 00:55:11 +00:00
Paul Scovanner 1b1f522007 [automerger skipped] Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f am: 28bb26cec7 -s ours am: 76530937da -s ours am: 21691ce5f4 -s ours am: 81728953b4 -s ours 
am skip reason: Merged-In Icea699ec7f82744ff0a6dca90068b2737129778a with SHA-1 cfd4896dc2 is already in history

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

Change-Id: Ic992cef2c57399bcf424ddc2cf1c72a82ff463f5
 2021-07-02 00:55:07 +00:00
Paul Scovanner 22d840e154 [automerger skipped] Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f am: 28bb26cec7 -s ours am: 76530937da -s ours am: 7800a61f24 -s ours 
am skip reason: Merged-In Icea699ec7f82744ff0a6dca90068b2737129778a with SHA-1 cfd4896dc2 is already in history

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

Change-Id: I463f69407d1dc99773dc760cacc000a9d50d13b8
 2021-07-02 00:43:18 +00:00
Paul Scovanner 81728953b4 [automerger skipped] Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f am: 28bb26cec7 -s ours am: 76530937da -s ours am: 21691ce5f4 -s ours 
am skip reason: Merged-In Icea699ec7f82744ff0a6dca90068b2737129778a with SHA-1 cfd4896dc2 is already in history

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

Change-Id: Ifa2011aaacb8f6a2697e071fd3ad5c5268f5240c
 2021-07-02 00:42:18 +00:00
Paul Scovanner 7800a61f24 [automerger skipped] Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f am: 28bb26cec7 -s ours am: 76530937da -s ours 
am skip reason: Merged-In Icea699ec7f82744ff0a6dca90068b2737129778a with SHA-1 cfd4896dc2 is already in history

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

Change-Id: I68488fe5ebaa9ff601537e229d62aaa2c4497ab3
 2021-07-02 00:26:06 +00:00
Paul Scovanner 21691ce5f4 [automerger skipped] Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f am: 28bb26cec7 -s ours am: 76530937da -s ours 
am skip reason: Merged-In Icea699ec7f82744ff0a6dca90068b2737129778a with SHA-1 cfd4896dc2 is already in history

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

Change-Id: I860c4eceb7fa11c996b16ca660f81027398ff617
 2021-07-02 00:26:05 +00:00
Paul Scovanner 76530937da [automerger skipped] Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f am: 28bb26cec7 -s ours 
am skip reason: Merged-In Icea699ec7f82744ff0a6dca90068b2737129778a with SHA-1 cfd4896dc2 is already in history

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

Change-Id: I0edba4615416cd7a867ca367318e3a9db76dcc60
 2021-07-02 00:12:36 +00:00
Paul Scovanner 28bb26cec7 Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123745

Change-Id: Id32d0b6aa4a12afd336ed79b1dc61e0cc4c96065
 2021-07-01 23:51:19 +00:00
Paul Scovanner abecfaa90f Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123745

Change-Id: I78b8f8bf0fb3dd657b1cef238395d8aa73784cbe
 2021-07-01 23:36:15 +00:00
Paul Scovanner 996d1d3a4f Update Security String to 2021-09-01 am: 639164b255 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123745

Change-Id: I2d98e6e8f13a7146d946fd38a7bd9400197a0151
 2021-07-01 23:15:23 +00:00
Android Build Coastguard Worker 6f06fefcf3 Version bump to SD2A.210701.002 [core/build_id.mk] 
Change-Id: I2caff0967685823f224ad25c46a461e620ab5b74
 2021-07-01 17:42:05 +00:00
Martin Stjernholm b80b1bb3fb [automerger skipped] Merge "Revert "Use prebuilts of the ART Module by default."" into sc-dev am: 3d8c30792b -s ours 
am skip reason: Merged-In I8990b726affeb08eabf130d20be45129a7c1c58d with SHA-1 43747aafb1 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13552665

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

Change-Id: If5fab0021b9cc3964800f3e1d9b1335d97918290
 2021-07-01 16:30:29 +00:00
Martin Stjernholm 3d8c30792b Merge "Revert "Use prebuilts of the ART Module by default."" into sc-dev 2021-07-01 16:14:49 +00:00
Martin Stjernholm 751f1ddbef Revert "Use prebuilts of the ART Module by default." 
This reverts commit efab03ff61.

Reason for revert: Breaks sc-dev builds.

Merged-In set to http://ag/15107826 to avoid merging downstream.

Bug: 192558747
Change-Id: Id17caafee41b5aed65b5b294c729a548379aa41a
Merged-In: I8990b726affeb08eabf130d20be45129a7c1c58d
 2021-07-01 16:12:43 +00:00
Martin Stjernholm 381bbee8f9 [automerger skipped] Merge "Use prebuilts of the ART Module by default." into sc-dev am: b832fba84c -s ours 
am skip reason: Merged-In I8990b726affeb08eabf130d20be45129a7c1c58d with SHA-1 43747aafb1 is already in history

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

Change-Id: I0dc80c7676aa42b40d2151029f4cfd546a480a2a
 2021-07-01 15:11:03 +00:00