Commit Graph

26411 Commits

Author SHA1 Message Date
Yifan Hong
b1627779fb Also extract kernel configs from boot image.
On devices with prebuilt generic boot image:
  TARGET_NO_KERNEL := true
  BOARD_PREBUILT_BOOTIMAGE is set
In this case, the process for extracting the kernel
config and version must also try extracting from the
prebuilt boot image.

Test: build on device with prebuilt boot image
Fixes: 193588301
Change-Id: I43dd8e206bcd1c9f3f5f51869f126791c50af01a
2021-07-15 12:57:47 -07:00
Martin Stjernholm
1b00d58d93 Merge "Document how APEXes are identified in the boot jar variables." 2021-07-15 18:57:00 +00:00
Martin Stjernholm
b2de2d6f0c Fix typo in MODULE_BUILD_FROM_SOURCE variable.
Cherry-picked from http://ag/15300830.

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
Merged-In: I2056b198bc0b944a6736ff21077b902df13c1479
2021-07-15 16:23:15 +01:00
Treehugger Robot
e01cfe4896 Merge "dexpreopt.config should be created even though unbundled image is built" 2021-07-15 03:41:30 +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
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
Alexander Smundak
4b8d81b41c Merge "Add mkpatsubst" 2021-07-13 22:11:03 +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
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
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
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
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
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
Jan Monsch
e147d481fe Removing AFTL integration from release tools.
Bug: 158639560
Test: Treehugger
Change-Id: I6949385e3448ad539099966c41ce99f156e3fdc4
2021-06-29 12:38:59 +00:00
Orion Hodson
e4debbf136 Merge "Update owners for dex_preopt and verify_uses_libraries" 2021-06-25 08:52:09 +00:00
Dario Freni
f753bc5890 Add MODULE_BUILD_FROM_SOURCE env variable.
When set, module builds will prefer source where applicable.

Bug: 191978129
Test: m; MODULE_BUILD_FROM_SOURCE=true m
Change-Id: Ie7f928674a511a98f17653fa814a42194ee0e9f9
2021-06-24 17:36:20 +00:00
Jeongik Cha
44d1de7b0d Merge "Emit DexPreoptImageLocationsOnDevice as well" 2021-06-23 23:59:07 +00:00
Jeongik Cha
242c436242 Emit DexPreoptImageLocationsOnDevice as well
Bug: 158843648
Test: check if dexpreopt config for the module defined in mk has
DexPreoptImageLocationsOnDevice field.

Change-Id: Ie8c7b1c8c5a6797f71920d9ce671dde0e1f489a3
2021-06-23 23:21:07 +09:00
Treehugger Robot
7b511794ec Merge "Quote the package name -- may contain special chars" 2021-06-22 16:29:02 +00:00
Xin Li
47e76c7a7a Merge "Master is T" 2021-06-22 02:15:38 +00:00
Bob Badour
c3c04f44da Quote the package name -- may contain special chars
Special characterts like & can cause problems if not quoted.

Test: m nothing

Bug: 191604339

Change-Id: I86f659de4a956a3186f21a5333781b92b71e7c17
2021-06-21 12:55:24 -07:00
Devin Moore
c92ebe14f2 Merge "Revert "Throw an error if androidboot.hardware is used for bootconfig"" 2021-06-21 18:22:31 +00:00
Colin Cross
d2e445148a Master is T
Bug: 186121492
Test: treehugger
Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905
Change-Id: Ie5ee4479ba98b9f4525b36e38493879a15661905
(cherry picked from commit 5e9ba92e05)
2021-06-21 01:28:32 -07:00
android-build-team Robot
7ef04b2f41 Version bump to RQ3A.210805.001.A1 [core/build_id.mk]
Change-Id: I8d44f5933d58c0d564983c15cb4aa2ec57575c8f
2021-06-19 05:07:51 +00:00
Xin Li
618ba8464d DO NOT MERGE - Merge RQ3A.210605.005
Bug: 190855093
Merged-In: I4ab3c7053d6b3e669a928307fb17418d2b96749c
Change-Id: I7130ccdf6abae265352723e05de325a6cbd086e5
2021-06-18 15:42:08 -07:00
Devin Moore
5fe993f0cf Revert "Throw an error if androidboot.hardware is used for bootconfig"
This reverts commit 2e43e34d53.

The kernel bootconfig feature has been updated to handle mixed subkeys
and values, so androidboot.hardware is ok to use now.

Test: build and boot cuttlefish with 'hardware=cutf_vm'
Test: build and boot cuttlefish with 'androidboot.hardware=cutf_vm'
Bug: 191502832
Change-Id: I7c3f330a73abe6cf1fb7d14aaaa6cbc3e874a4aa
2021-06-18 13:42:48 -07:00
Inseob Kim
389d81d13e Merge changes from topic "init_first_stage_soong"
* changes:
  Add BUILD_USES_RECOVERY_AS_BOOT to soong config
  Directly create ramdisk dirs in ramdisk image rule
  Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
2021-06-18 17:12:23 +00:00
TreeHugger Robot
9e581ca2cd Merge "DO NOT MERGE - Merge RQ3A.210605.005" into stage-aosp-master 2021-06-18 11:38:14 +00:00
Treehugger Robot
6b27401ca1 Merge "Add 31.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: 97b0ada631
Original change: https://android-review.googlesource.com/c/platform/build/+/1737423

Change-Id: I4ab3c7053d6b3e669a928307fb17418d2b96749c
2021-06-18 11:25:03 +00:00
Treehugger Robot
97b0ada631 Merge "Add 31.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" 2021-06-18 11:15:42 +00:00
Xin Li
33c2dd6d61 DO NOT MERGE - Merge RQ3A.210605.005
Bug: 190855093
Merged-In: Ibfaf0bcc7e4525786eca62cafc7548030be40c61
Change-Id: Iec9e57f2d6f1afe3015b4c6034612fc0593e2704
2021-06-18 06:43:16 +00:00
Bill Peckham
6750e52f23 Merge changes Ie63d08ac,Ia7f8200c am: 79b0ec0309
Original change: https://android-review.googlesource.com/c/platform/build/+/1738485

Change-Id: I0868cbe3e5e8cadd0dd6aebfc980b94ff0dffddd
2021-06-18 01:59:11 +00:00
Bill Peckham
ba9ddd3cb7 Introduce droidcore-unbundled target am: 16da01fe20
Original change: https://android-review.googlesource.com/c/platform/build/+/1731753

Change-Id: Ie536e58e431e326a9eeb61f1504299c8a4089f31
2021-06-18 01:58:43 +00:00
Bill Peckham
79b0ec0309 Merge changes Ie63d08ac,Ia7f8200c
* changes:
  Fix typo in droidcore-unbundled.
  Introduce droidcore-unbundled target
2021-06-17 22:26:40 +00:00
Treehugger Robot
2f58c897aa Merge "Remove --compatible-output=no as it is now default" am: 8d67d62e55
Original change: https://android-review.googlesource.com/c/platform/build/+/1739037

Change-Id: Ia56d937c7b3c69c55cd01f3654e430243be71518
2021-06-17 19:40:42 +00:00
Aurimas Liutikas
b3ca1a632f Remove --compatible-output=no as it is now default
Change-Id: I4dbc78473eda1807cfa812dc7e79f804e6dd8c9c
Test: treehugger
2021-06-17 09:13:20 -07:00
Orion Hodson
915a2e77c5 Update owners for dex_preopt and verify_uses_libraries
Bug: none
Test: none
Change-Id: Iff86df4c36fe36c6206dfc64acbeb72eba166861
2021-06-17 17:04:23 +01:00
Bill Peckham
d07e1c0077 Fix typo in droidcore-unbundled.
Test: manual inspection.
Bug: 191304308
Merged-In: Ie63d08acff0b9accfafd906a43bd18cbef5471a3
Change-Id: Ie63d08acff0b9accfafd906a43bd18cbef5471a3
2021-06-16 20:54:39 -07:00
Bill Peckham
16da01fe20 Introduce droidcore-unbundled target
The droidcore-unbundled target replaces the droidcore
target when TARGET_BUILD_UNBUNDLED_IMAGE=true. This
target is similar to droidcore in terms of dependencies,
but it has a smaller set of dist files. The intention is
to use TARGET_BUILD_UNBUNDLED_IMAGE=true with a
VSDK-using vendor build to supply Java dependencies from
prebuilts to avoid building (or needing) Java framework
sources.

Test: build with and without TARGET_BUILD_UNBUNDLED_IMAGE=true
Test: m nothing dist (before patch)
Test: m nothing dist (after patch)
Test: m nothing dist TARGET_BUILD_UNBUNDLED_IMAGE=true (after patch)
Test: examine ninja build graph for previous 3 tests
Bug: 188176942
Bug: 187064252
Merged-In: Ia7f8200c1bb1aaaa57c177d1698a114efe26bec7
Change-Id: Ia7f8200c1bb1aaaa57c177d1698a114efe26bec7
2021-06-16 09:10:07 -07:00
Inseob Kim
b8e274097d Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Bug: 190974433
Test: build
Change-Id: I2a0daa6127e94366b7b6cfa5cec0080169a469e3
2021-06-16 21:08:49 +09:00
Inseob Kim
adcdb2fbda Directly create ramdisk dirs in ramdisk image rule
These directories have been created with post install cmds of
init_first_stage. To migrate init_first_stage to Soong, the directory
rules are now written directly in ramdisk image rule.

Bug: 187196593
Test: "m installclean; m" and see ramdisk output
Change-Id: Ic76c325ce102347f20b282572e3edbb5b4359aaf
2021-06-16 20:58:59 +09:00