Age | Commit message (Collapse) | Author |
|
mainline-conscrypt-release
Change-Id: I1d434c9c71a85506d5186ef05afa16520944fc3c
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15277370
Change-Id: I3c366185acea19784355308cd9fe26c5a9c0d06e
|
|
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
|
|
f68bd2db71
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15234812
Change-Id: I73119adad0869e35ba0426c80e7291ec839df805
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15234811
Change-Id: I4b80651f21273c9f72ee25307b999f1034078635
|
|
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
|
|
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
|
|
(reland)."" into sc-dev am: ddfa249778
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15217854
Change-Id: I961f4a8db2ddde3a1c1703a95a3bb94e41d78c17
|
|
am: 5031d7f844
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15217854
Change-Id: If7780be26eab85665d467c3b442b841a0aca3c2d
|
|
(reland)."" into sc-dev
|
|
This reverts commit 6a3fd20b35b80de32dd0eb774a9a8f9a59dc068f.
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
|
|
into sc-dev am: c9a802862f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15200786
Change-Id: Ia090027a06bb337ea1af986fdb0ecac43d7549ea
|
|
6a3fd20b35
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15200786
Change-Id: Ia32d4535b78d5e99d4466fa85b5c9f5392c3ee19
|
|
into sc-dev
|
|
into sc-dev am: 7e2e4be86c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15167736
Change-Id: I985ee7be784ce1d52b502bcc12d25e1b4ffb8b1f
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15167735
Change-Id: Ibdd3a435ec4f2937131e12a1146b63a164a45669
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15167734
Change-Id: I80a0dc74fb981654093f48e15ad857045789f54c
|
|
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"
|
|
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
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14732008
Change-Id: Ie46480ab60e74a353345077b6d5fdc5d8dcad9e1
|
|
|
|
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: I75671b7d66c57bf300d7d8cfad9c68fa76573809
|
|
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: I988c6b9e2645e82d7430ec9085b85b8ec883c755
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
abecfaa90f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123745
Change-Id: Id32d0b6aa4a12afd336ed79b1dc61e0cc4c96065
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123745
Change-Id: I78b8f8bf0fb3dd657b1cef238395d8aa73784cbe
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123745
Change-Id: I2d98e6e8f13a7146d946fd38a7bd9400197a0151
|
|
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: I6023b6ef85ac426c00ab6777727c6a7374f491d9
|
|
|
|
This reverts commit efab03ff61297fadb303170fdf728e3324bfde2f.
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
|
|
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: I9cb77e65a206de71e300ee52799301ab162ca7b4
|
|
|
|
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.
Merged-In set to http://ag/15107826 to avoid merging downstream.
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
Merged-In: I8990b726affeb08eabf130d20be45129a7c1c58d
Change-Id: Id719640d17effca107af82de69e45514bf3bd234
|
|
46fb33d93a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744
Change-Id: I9a3868dd81036de857b50d4e2d0c3e1789e1b58f
|
|
7df23ee7aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744
Change-Id: I43180aa0d0633f761fd1e34beb95dbbf43f63e58
|
|
744d6629d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15135721
Change-Id: I7596cd1f70bf040d5a5bec06de1777bdd96c1a09
|
|
a18d4d84db
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15107826
Change-Id: I68481c62627ac11692cfbce24ff4be93f8fde0e4
|
|
59b80b91a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14112924
Change-Id: Ib6676128e2ac5cddbc2d877c4925ace2bad6740b
|
|
Revert "Add install_in_root to cc_binary"
Revert "Add ramdisk_available to init_first_stage's deps"
Revert submission 15071196-init_first_stage_soong
Reason for revert: fixes b/192248690
Reverted Changes:
I23cf4f975:Add ramdisk_available to init_first_stage's deps
Icd98c7e24:Add ramdisk_available to init_first_stage's deps
If9da9ba16:Add ramdisk_available to init_first_stage's deps
Ibc8668029:Add ramdisk_available to init_first_stage's deps
I3b4b8c475:Add ramdisk_available to init_first_stage's deps
I59cd149e0:Completely migrate init first stage to Soong
I36d789578:Add ramdisk_available to init_first_stage's deps
I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule...
I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
I8aab5faf3:Add ramdisk_available to init_first_stage's deps
I9d5a10661:Add ramdisk_available to init_first_stage's deps
Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps
I7cb582ca0:Update init_first_stage
I06091d15e:Add ramdisk_available to init_first_stage's deps
I8bdb8dda3:Add ramdisk_available to init_first_stage's deps
I7436b8dd1:Add ramdisk_available to init_first_stage's deps
I39693fd86:Add ramdisk_available to init_first_stage's deps
I0a9ba90f0:Add ramdisk_available to init_first_stage's deps
Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps
I31ce63d23:Add ramdisk_available to init_first_stage's deps
Icb580f97c:Add ramdisk_available to init_first_stage's deps
I044a075b7:Add ramdisk_available to init_first_stage's deps
I33164a7e7:Fix ndk and aml arch order
Ib8d92904a:Add ramdisk_available to sysprop_library
Ibc3516453:Add install_in_root to cc_binary
Change-Id: Ic72702cf9d48367b3de30cf29f68a7e8fb0040ce
|
|
Revert "Add install_in_root to cc_binary"
Revert "Add ramdisk_available to init_first_stage's deps"
Revert submission 15071196-init_first_stage_soong
Reason for revert: fixes b/192248690
Reverted Changes:
I23cf4f975:Add ramdisk_available to init_first_stage's deps
Icd98c7e24:Add ramdisk_available to init_first_stage's deps
If9da9ba16:Add ramdisk_available to init_first_stage's deps
Ibc8668029:Add ramdisk_available to init_first_stage's deps
I3b4b8c475:Add ramdisk_available to init_first_stage's deps
I59cd149e0:Completely migrate init first stage to Soong
I36d789578:Add ramdisk_available to init_first_stage's deps
I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule...
I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
I8aab5faf3:Add ramdisk_available to init_first_stage's deps
I9d5a10661:Add ramdisk_available to init_first_stage's deps
Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps
I7cb582ca0:Update init_first_stage
I06091d15e:Add ramdisk_available to init_first_stage's deps
I8bdb8dda3:Add ramdisk_available to init_first_stage's deps
I7436b8dd1:Add ramdisk_available to init_first_stage's deps
I39693fd86:Add ramdisk_available to init_first_stage's deps
I0a9ba90f0:Add ramdisk_available to init_first_stage's deps
Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps
I31ce63d23:Add ramdisk_available to init_first_stage's deps
Icb580f97c:Add ramdisk_available to init_first_stage's deps
I044a075b7:Add ramdisk_available to init_first_stage's deps
I33164a7e7:Fix ndk and aml arch order
Ib8d92904a:Add ramdisk_available to sysprop_library
Ibc3516453:Add install_in_root to cc_binary
Change-Id: I2fe09d7a44567f5f3cfd08c89a60e9e94e8fe0e3
|
|
Revert "Add install_in_root to cc_binary"
Revert "Add ramdisk_available to init_first_stage's deps"
Revert submission 15071196-init_first_stage_soong
Reason for revert: fixes b/192248690
Reverted Changes:
I23cf4f975:Add ramdisk_available to init_first_stage's deps
Icd98c7e24:Add ramdisk_available to init_first_stage's deps
If9da9ba16:Add ramdisk_available to init_first_stage's deps
Ibc8668029:Add ramdisk_available to init_first_stage's deps
I3b4b8c475:Add ramdisk_available to init_first_stage's deps
I59cd149e0:Completely migrate init first stage to Soong
I36d789578:Add ramdisk_available to init_first_stage's deps
I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule...
I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
I8aab5faf3:Add ramdisk_available to init_first_stage's deps
I9d5a10661:Add ramdisk_available to init_first_stage's deps
Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps
I7cb582ca0:Update init_first_stage
I06091d15e:Add ramdisk_available to init_first_stage's deps
I8bdb8dda3:Add ramdisk_available to init_first_stage's deps
I7436b8dd1:Add ramdisk_available to init_first_stage's deps
I39693fd86:Add ramdisk_available to init_first_stage's deps
I0a9ba90f0:Add ramdisk_available to init_first_stage's deps
Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps
I31ce63d23:Add ramdisk_available to init_first_stage's deps
Icb580f97c:Add ramdisk_available to init_first_stage's deps
I044a075b7:Add ramdisk_available to init_first_stage's deps
I33164a7e7:Fix ndk and aml arch order
Ib8d92904a:Add ramdisk_available to sysprop_library
Ibc3516453:Add install_in_root to cc_binary
Change-Id: I5e1d58bdb3ebff7125b64a8f2e940f7d203dac74
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744
Change-Id: I717558090f790d8883bfda0ac019283758b1a7b2
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744
Change-Id: I223dd4c0495601db35c400fdac944713b1d809a3
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744
Change-Id: I2e952857242dae3015c71903ea4353c42185be5d
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744
Change-Id: Ic0a375700bd7dc707449ced79e0efe893cc43a25
|
|
|