StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,798 Commits 1 Branch 0 Tags
dc40e465b47ddca6ac09946ffb2ff8ebdf3c9db7
Commit Graph

29493 Commits

Author SHA1 Message Date
Cole Faust
4cb47e64a9 Merge "Return product config variables from board_configuration" am: 4228f8f7a3 am: 390d1e0795 
Original change: https://android-review.googlesource.com/c/platform/build/+/1900113

Change-Id: I8471bbd689cde2bd9d37cd7ca68f5842a349c323
 2021-11-23 21:22:21 +00:00
Cole Faust
390d1e0795 Merge "Return product config variables from board_configuration" am: 4228f8f7a3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1900113

Change-Id: I36ebee83203c28d40498ca85935b662e222f317a
 2021-11-23 21:04:27 +00:00
Cole Faust
4228f8f7a3 Merge "Return product config variables from board_configuration" 2021-11-23 20:46:45 +00:00
Treehugger Robot
ffde561934 Merge "Disallow setting LOCAL_MODULE_STEM for android packages" am: 55870dd500 am: 871500d4b6 am: e1c4d9dd2b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1880753

Change-Id: Ib55077914baf273f7431bb839bd0c5a7d0ff36cc
 2021-11-23 06:06:03 +00:00
Treehugger Robot
e1c4d9dd2b Merge "Disallow setting LOCAL_MODULE_STEM for android packages" am: 55870dd500 am: 871500d4b6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1880753

Change-Id: Ieb08b50f9548ae60b2dc5d63e2be33924a11222f
 2021-11-23 05:47:46 +00:00
Treehugger Robot
871500d4b6 Merge "Disallow setting LOCAL_MODULE_STEM for android packages" am: 55870dd500 
Original change: https://android-review.googlesource.com/c/platform/build/+/1880753

Change-Id: I60ebc76a554355e48e0ee6b6d3d3a716ed842b3d
 2021-11-23 05:36:16 +00:00
Treehugger Robot
55870dd500 Merge "Disallow setting LOCAL_MODULE_STEM for android packages" 2021-11-23 05:21:15 +00:00
Cole Faust
f0d7d8ff73 Return product config variables from board_configuration 
The board config can actually change a few product config
variables that are not made read-only.

Bug: 201700692
Test: ./build/bazel/ci/rbc_regression_test.sh -b aosp_cf_x86_64_phone
Change-Id: Ib2ac04ac2c5a56d32bca51fc8189e44e180075ee
 2021-11-22 16:31:46 -08:00
Paul Scovanner
9e20227ea5 [DO NOT MERGE] 
Update Security String to 2022-01-05

Bug: 207022948
Change-Id: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
 2021-11-22 21:45:58 +00:00
Martin Stjernholm
e7309cea6d Merge "Configure boot image profiles for platform and unbundled ART module builds (reland)." am: f823ec6e99 am: 382d8ae9c4 am: cffbc40ea9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1896660

Change-Id: I6eaf49afa42e1f6ee037b080af0f3cd00e2e08e5
 2021-11-22 14:45:08 +00:00
Martin Stjernholm
cffbc40ea9 Merge "Configure boot image profiles for platform and unbundled ART module builds (reland)." am: f823ec6e99 am: 382d8ae9c4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1896660

Change-Id: Ib55f87b43a0d6a7a4c7189958695f6f97383c520
 2021-11-22 14:35:46 +00:00
Martin Stjernholm
382d8ae9c4 Merge "Configure boot image profiles for platform and unbundled ART module builds (reland)." am: f823ec6e99 
Original change: https://android-review.googlesource.com/c/platform/build/+/1896660

Change-Id: I4f7a2e3c953e65d756f2eec9d7afdc033187682c
 2021-11-22 14:24:16 +00:00
Inseob Kim
d29e8b2db8 Add 31.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS 
Bug: 189161483
Bug: 207344718
Test: m selinux_policy
Change-Id: I48b681fb28c78ea9dca922f5fb58f19a940c1a51
Merged-In: I48b681fb28c78ea9dca922f5fb58f19a940c1a51
(cherry picked from commit 94c27efb68)
 2021-11-22 12:10:59 +00:00
Martin Stjernholm
91964c82e3 Configure boot image profiles for platform and unbundled ART module 
builds (reland).

- Use art/build/boot/boot-image-profile.txt for the primary boot image
  in the ART module, both when it's built from source in platform and
  as an unbundled module.

- Use frameworks/base/boot/boot-image-profile.txt for the framework
  extension image in platform, but not in unbundled builds.

This should obsolete the combined profile
frameworks/base/config/boot-image-profile.txt.

This relands https://r.android.com/1881863 with a fix to allow multiple
values on PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION.

Test: build/soong/soong_ui.bash --dumpvar-mode \
        PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION
  and check that it prints both art/build/boot/boot-image-profile.txt
  and frameworks/base/boot/boot-image-profile.txt in a platform build
  on master.
Test: build/soong/soong_ui.bash --dumpvar-mode \
        PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION
  and check that it prints only art/build/boot/boot-image-profile.txt
  in an unbundled build on master-art.
Test: banchan com.android.art && m
  on master-art and check that
  out/soong/.intermediates/art/build/apex/com.android.art/android_common_com.android.art_image/image.apex/javalib/x86_64/boot.oat
  shrinks from 14 MB to 4.7.
Test: m droid
  on master together with https://r.android.com/1895131 and check that
  out/soong/.intermediates/art/build/apex/com.android.art/android_common_com.android.art_image/image.apex/javalib/x86_64/boot.oat
  and out/target/product/vsoc_x86_64/system/framework/x86_64/boot-framework.oat
  are identical.
Test: lunch armv8-eng && art/tools/buildbot-build.sh
  on master-art
Bug: 174746397
Change-Id: I9114271bc69cf0888150b2c778a086bc50b73045
 2021-11-19 16:21:37 +00:00
Treehugger Robot
bc0cc5d62c Merge "Update conversion results file only when it changed." am: 9a991fab04 am: f15629526d am: 5499092f0e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1896415

Change-Id: I81240fec66d2fdfe78386d4da304af95535b06d6
 2021-11-19 04:02:05 +00:00
Treehugger Robot
5499092f0e Merge "Update conversion results file only when it changed." am: 9a991fab04 am: f15629526d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1896415

Change-Id: Iff544e80dd0ea88fd62bb4008aea81bb80b3d1b4
 2021-11-19 03:45:49 +00:00
Treehugger Robot
f15629526d Merge "Update conversion results file only when it changed." am: 9a991fab04 
Original change: https://android-review.googlesource.com/c/platform/build/+/1896415

Change-Id: Ic198132d5816ffd0e33bf07f6c9116fa8618e0e8
 2021-11-19 03:32:11 +00:00
Colin Cross
546543bcd1 Merge "Extract primary APK from apk sets in Soong" am: 345da983ad am: 013b1ee778 am: de84cc8b72 
Original change: https://android-review.googlesource.com/c/platform/build/+/1893500

Change-Id: Ie780d096a44162d153298066e94a82ef50005111
 2021-11-19 03:19:03 +00:00
Treehugger Robot
9a991fab04 Merge "Update conversion results file only when it changed." 2021-11-19 03:12:12 +00:00
Colin Cross
de84cc8b72 Merge "Extract primary APK from apk sets in Soong" am: 345da983ad am: 013b1ee778 
Original change: https://android-review.googlesource.com/c/platform/build/+/1893500

Change-Id: I40432b5f40c6c403f30e3ae55b76cffce6da155a
 2021-11-19 02:58:27 +00:00
Colin Cross
013b1ee778 Merge "Extract primary APK from apk sets in Soong" am: 345da983ad 
Original change: https://android-review.googlesource.com/c/platform/build/+/1893500

Change-Id: Ib27dd9280f1aeabe0ba1f201518b0a8db06f0215
 2021-11-19 02:33:56 +00:00
Colin Cross
345da983ad Merge "Extract primary APK from apk sets in Soong" 2021-11-19 02:18:20 +00:00
Colin Cross
da166c5ad4 Make SOONG_HOST_OUT an alias for HOST_OUT 
Soong now installs to the same directory as Make, point SOONG_HOST_OUT
at HOST_OUT.

Bug: 204136549
Test: m checkbuild
Change-Id: I49bfc0466056d270c8023288a6fe778c3445a900
 2021-11-18 16:26:58 -08:00
Sasha Smundak
7dc8f486c2 Update conversion results file only when it changed. 
Test: treehugger
Change-Id: Ia0d6bf614fa0714a977b2880f7271d54df034366
 2021-11-18 15:17:59 -08:00
Treehugger Robot
72cc63b159 Merge changes from topics "dist_for_goals", "mk2star" am: 613ae210f6 am: 2d04577ee7 am: e116a5d35b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1890801

Change-Id: I9611c2cc48633c1be5ace78f10e702a4c2354294
 2021-11-18 23:03:57 +00:00
Treehugger Robot
e116a5d35b Merge changes from topics "dist_for_goals", "mk2star" am: 613ae210f6 am: 2d04577ee7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1890801

Change-Id: Ife5f0bbe246316490fc88feb1a352062d7a19f16
 2021-11-18 22:46:45 +00:00
Treehugger Robot
2d04577ee7 Merge changes from topics "dist_for_goals", "mk2star" am: 613ae210f6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1890801

Change-Id: I9dbe243c6941b04fe8262e59c072fa6a2839d0e2
 2021-11-18 22:23:49 +00:00
Xin Li
0d8b812568 Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master 2021-11-18 21:28:37 +00:00
Sasha Smundak
c20dd972a9 Runtime reporting of the conversion errors. 
Bug: 204062171
Test: rbcrun build/make/tests/conversion_error.rbc (displays a message, stops)
  rbcrun RBC_MK2RBC_CONTINUE=t build/make/tests/conversion_error.rbc  (displays a message and continues)
Change-Id: Idf0fe6bbb08b1eca1f392d81950eed4a214f3289
 2021-11-18 11:27:55 -08:00
Sasha Smundak
91fc734100 Runtime support for dist-for-goals. 
Convert dist-for-goals.

Bug: 198496782
Test: rbcrun build/make/tests/run.rbc
Change-Id: I46ef9e897143aecf8bd28ad8569d48e74530b0e5
 2021-11-18 11:20:34 -08:00
Yifan Hong
c5785c29c9 Add recovery service_contexts. am: 276b8c0230 am: c59eeaa272 am: 935c6006b9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1891251

Change-Id: I2fe0051b27476c0b867458d6bb820ae8d9dde984
 2021-11-18 05:34:45 +00:00
Yifan Hong
935c6006b9 Add recovery service_contexts. am: 276b8c0230 am: c59eeaa272 
Original change: https://android-review.googlesource.com/c/platform/build/+/1891251

Change-Id: I9af984fb98bf4a32b2c90c301f22afa22b41dd12
 2021-11-18 05:17:58 +00:00
Yifan Hong
c59eeaa272 Add recovery service_contexts. am: 276b8c0230 
Original change: https://android-review.googlesource.com/c/platform/build/+/1891251

Change-Id: Ic397dc0036431b9bdb90ffbd2ba80f32288e1a6c
 2021-11-18 05:01:37 +00:00
Yifan Hong
351cd2e489 Merge changes from topic "servicemanager-recovery" 
* changes:
  Add servicemanager.recovery to base_vendor.mk.
  Add recovery service_contexts.
 2021-11-18 04:39:14 +00:00
Colin Cross
f42c7d6be1 Extract primary APK from apk sets in Soong 
In preparation for Soong handling the installation rules, extract
the primary APK from the apk set in Soong.

Bug: 204136549
Test: build test android_app_set
Change-Id: I416b57009101ca4c05c11102f260e102af13bf0d
 2021-11-17 19:45:49 -08:00
Treehugger Robot
71a2325008 Merge "Add notdir implementation" am: dacbe7a5a2 am: f0cd91219d am: 74d752a5ea 
Original change: https://android-review.googlesource.com/c/platform/build/+/1892961

Change-Id: Ie44e5860b349e36d0bc543de278fa85e7a3d1ce2
 2021-11-17 21:47:48 +00:00
Treehugger Robot
74d752a5ea Merge "Add notdir implementation" am: dacbe7a5a2 am: f0cd91219d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1892961

Change-Id: I520fbca0f04163a44f5bbb686e1968db4bfab70f
 2021-11-17 21:36:26 +00:00
Treehugger Robot
dacbe7a5a2 Merge "Add notdir implementation" 2021-11-17 20:58:24 +00:00
Cole Faust
0cc94d3275 Add notdir implementation 
mk2rbc would already translate notdir calls,
but since there was no implementation it would
fail at runtime.

Bug: 201700692
Test: m rbcrun; rbcrun build/make/tests/run.rbc
Change-Id: Ie0f4e7b65448e612fa56f87b0bc138648cc0ad58
 2021-11-17 10:50:14 -08:00
Android Build Coastguard Worker
8dc106e599 Version bump to SQ1A.211205.010 [core/build_id.mk] 
Change-Id: I5a87dd2cefcfd7d6b46f5b1c536ab06b53a454c8
 2021-11-17 18:23:35 +00:00
Cole Faust
f2d86f78b1 Merge "Don't assume _soong_config_namespaces_key is present" am: 8a7e9afc54 am: 35d5a4331c am: 242445d62c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1892960

Change-Id: Ife8372497edc97d0a9b35953a504a303f23a9cb0
 2021-11-16 20:44:27 +00:00
Cole Faust
242445d62c Merge "Don't assume _soong_config_namespaces_key is present" am: 8a7e9afc54 am: 35d5a4331c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1892960

Change-Id: I5b958d35c901fb18f77842b880f4c0825efca13a
 2021-11-16 20:33:31 +00:00
Cole Faust
8a7e9afc54 Merge "Don't assume _soong_config_namespaces_key is present" 2021-11-16 19:45:20 +00:00
Michael Wright
ce80edb3f6 Merge "Revert back to 12 instead of 12L" into sc-v2-dev-plus-aosp 2021-11-16 12:45:55 +00:00
Android Build Coastguard Worker
314b562dc0 Version bump to SQ1A.211205.009 [core/build_id.mk] 
Change-Id: I526237e29ba83c5f2dc366912d2ee6ce51235d9a
 2021-11-16 08:28:12 +00:00
Colin Cross
113dc5c9ac Merge "Translate BUILT_INSTALLED to LOCAL_BUILT_MODULE" am: d1c2c4e1b8 am: 23eafdab4c am: 4b89b964c7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1892959

Change-Id: Ic1a1f6cbbdb51912d5a0ca05735bd923906e709c
 2021-11-16 00:55:08 +00:00
Colin Cross
4b89b964c7 Merge "Translate BUILT_INSTALLED to LOCAL_BUILT_MODULE" am: d1c2c4e1b8 am: 23eafdab4c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1892959

Change-Id: I9dd29cd7f9403d178d3334fd583465fb39008c9b
 2021-11-16 00:38:04 +00:00
Cole Faust
2f4692bf31 Don't assume _soong_config_namespaces_key is present 
The board configuration doesn't use init_globals(),
which is where _soong_config_namespaces_key normally
is set. Just assume empty dictionaries in
soong_config_namespace where appropriate.

Bug: 201700692
Test: build/bazel/ci/rbc_product_config.sh -b armv8-userdebug
Change-Id: I5f1e52fa0bdde32bff0e8db54861557dcb327190
 2021-11-15 16:03:51 -08:00
Colin Cross
d1c2c4e1b8 Merge "Translate BUILT_INSTALLED to LOCAL_BUILT_MODULE" 2021-11-15 23:57:57 +00:00
Michael Wright
32d117dd52 S V2 is now REL 
Bug: 204295952
Test: N/A
Change-Id: I5f94e458bf0c420341847a49242da20c9b4281e4
Merged-In: I5f94e458bf0c420341847a49242da20c9b4281e4
 2021-11-15 23:39:36 +00:00