Commit Graph

27520 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
ba6ac1cd4d DO NOT MERGE: Use prebuilts of the ART Module by default (reland). am: 6a3fd20b35
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15200786

Change-Id: Ib190bd6d402aeffb77bd7460f41c80b6f541bc8a
2021-07-07 12:27:28 +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
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
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
Bill Peckham
cc2961f54a Break dependency from droid_targets to blueprint_tools
But only for a TARGET_BUILD_UNBUNDLED_IMAGE build. Since
the unbundled image build attempts to remove as many
framework sources as possible, we'd like to remove the
sources and dependencies of some blueprint_tools as
well.

Test: m nothing dist
Test: Verify graph is unchanged
Test: m nothing dist TARGET_BUILD_UNBUNDLED_IMAGE=true
Test: Verify that graph no longer includes blueprint_tools
Bug: 192629969
Change-Id: Ibfb52b841379e20855d0a935a13ad047af2fe58d
2021-07-02 13:13:10 -07: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
b832fba84c Merge "Use prebuilts of the ART Module by default." into sc-dev 2021-07-01 14:57:38 +00:00
Martin Stjernholm
efab03ff61 Use prebuilts of the ART Module by default.
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
2021-07-01 14:20:21 +01:00
Inseob Kim
69389a1c3a Revert "Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars"
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
2021-07-01 06:50:40 +00:00
Inseob Kim
ef49dc6daa Revert "Directly create ramdisk dirs in ramdisk image rule"
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
2021-07-01 06:50:40 +00:00
Inseob Kim
e683a5fcea Revert "Add BUILD_USES_RECOVERY_AS_BOOT to soong config"
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
2021-07-01 06:50:40 +00:00
Android Build Coastguard Worker
90705dd0fd Make change and version bump to RQ3A.210905.001
Change-Id: I93827e5752f28f08b818ac9fee1ed02311328b01
2021-07-01 00:00:59 +00:00
Paul Scovanner
81696e7974 Update Security String to 2021-09-05
Bug: 192405736
Change-Id: Icea699ec7f82744ff0a6dca90068b2737129778a
(cherry picked from commit cfd4896dc2)
2021-06-30 23:58:24 +00:00
Paul Scovanner
be8bf158f0 Update Security String to 2021-09-05 am: cfd4896dc2 am: e88ac64d3d am: 7df23ee7aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: I709412b554a94bbecd8bc8ae71f86188ec932943
2021-06-30 23:04:35 +00:00
Paul Scovanner
7df23ee7aa Update Security String to 2021-09-05 am: cfd4896dc2 am: e88ac64d3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: I223dd4c0495601db35c400fdac944713b1d809a3
2021-06-30 22:52:04 +00:00
Paul Scovanner
e88ac64d3d Update Security String to 2021-09-05 am: cfd4896dc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: Ic0a375700bd7dc707449ced79e0efe893cc43a25
2021-06-30 22:37:02 +00:00
Martin Stjernholm
57d9268b51 Merge "Force building ART from source for AOSP products." into sc-dev am: a18d4d84db
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15107826

Change-Id: Ie6d552b4fb740b55bcc3c336775fdfdef78df8d6
2021-06-30 15:09:13 +00:00
Paul Scovanner
cfd4896dc2 Update Security String to 2021-09-05
Bug: 192405736
Change-Id: Icea699ec7f82744ff0a6dca90068b2737129778a
2021-06-30 00:36:24 +00:00
Martin Stjernholm
43747aafb1 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.

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
Bug: 192006406
Bug: 172480615
Change-Id: I8990b726affeb08eabf130d20be45129a7c1c58d
2021-06-29 19:26:31 +01:00