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

75758 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Stjernholm
42ed3ff161 Merge "Configure boot image profiles for platform and unbundled ART module builds (reland)." am: f823ec6e99 am: 382d8ae9c4 am: cffbc40ea9 am: e7309cea6d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1896660

Change-Id: Ic77fa13ec275ffcada7f4962cd361d90bd746dd6
 2021-11-22 15:00:18 +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
Martin Stjernholm
f823ec6e99 Merge "Configure boot image profiles for platform and unbundled ART module builds (reland)." 2021-11-22 14:10:54 +00:00
Treehugger Robot
c8a2df3f56 Merge "Fix signapk not found error when running ota_from_target_files locally" am: 1fb1088e88 am: 6f017f5ecd am: 203b192030 am: e7050a1e29 
Original change: https://android-review.googlesource.com/c/platform/build/+/1894855

Change-Id: Ia5a9c22f62953a4d7fb414a5b0a3ba91d3857674
 2021-11-20 00:19:38 +00:00
Treehugger Robot
e7050a1e29 Merge "Fix signapk not found error when running ota_from_target_files locally" am: 1fb1088e88 am: 6f017f5ecd am: 203b192030 
Original change: https://android-review.googlesource.com/c/platform/build/+/1894855

Change-Id: Iaec33bb50dc1a3ea55c00559eeba085549e4c121
 2021-11-20 00:01:14 +00:00
Treehugger Robot
203b192030 Merge "Fix signapk not found error when running ota_from_target_files locally" am: 1fb1088e88 am: 6f017f5ecd 
Original change: https://android-review.googlesource.com/c/platform/build/+/1894855

Change-Id: Ide863041263953e2f584d07b14754f9ed14c06e9
 2021-11-19 23:50:43 +00:00
Treehugger Robot
6f017f5ecd Merge "Fix signapk not found error when running ota_from_target_files locally" am: 1fb1088e88 
Original change: https://android-review.googlesource.com/c/platform/build/+/1894855

Change-Id: If708b86a46a486185cd2c571fa989260b476a4ca
 2021-11-19 23:38:06 +00:00
Treehugger Robot
1fb1088e88 Merge "Fix signapk not found error when running ota_from_target_files locally" 2021-11-19 23:25:05 +00:00
Joshua Trask
fd547d094e Merge "Add unbundled IntentResolver to base_system." 2021-11-19 22:40:52 +00:00
Kelvin Zhang
4fc3aa0bc3 Fix signapk not found error when running ota_from_target_files locally 
location of ota_from_target_files changed from
out/host/linux-x86/bin to
out/soong/host/linux-x86/bin . This changes relative position of
signapj.jar. To fix, use ANDROID_HOST_OUT as search path

Change-Id: I5397171566e9d7598b5ef16ae26641f0c183d748
 2021-11-19 11:34:54 -08: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
6376c047d1 Merge "Update conversion results file only when it changed." am: 9a991fab04 am: f15629526d am: 5499092f0e am: bc0cc5d62c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1896415

Change-Id: I661338f6dace7c06ac9c18b5bf1d348f09d9bb4c
 2021-11-19 04:13:16 +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
65ae54f8ec Merge "Extract primary APK from apk sets in Soong" am: 345da983ad am: 013b1ee778 am: de84cc8b72 am: 546543bcd1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1893500

Change-Id: I75146db69081a3b57a92e4a17f9f3cb0e03a9b99
 2021-11-19 03:31:25 +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
Treehugger Robot
769f8a1925 Merge changes from topics "dist_for_goals", "mk2star" am: 613ae210f6 am: 2d04577ee7 am: e116a5d35b am: 72cc63b159 
Original change: https://android-review.googlesource.com/c/platform/build/+/1890801

Change-Id: Ic97a14114d137234b788a7884b396bc110e9bbfd
 2021-11-18 23:22:43 +00: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
Xin Li
d56aa63bc1 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 0d8b812568 -s ours am: 9520b9c9ae -s ours am: f163a2b173 -s ours 
am skip reason: Merged-In I42fd618b5a018abd57e6eab4fe4ed6ba9f70a235 with SHA-1 d540a6b9fe is already in history

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

Change-Id: I58d769cb909ee9d964c4723b414ebf55309f6532
 2021-11-18 22:37:51 +00:00
Xin Li
f163a2b173 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 0d8b812568 -s ours am: 9520b9c9ae -s ours 
am skip reason: Merged-In I42fd618b5a018abd57e6eab4fe4ed6ba9f70a235 with SHA-1 d540a6b9fe is already in history

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

Change-Id: I9e9256b3179f0a472411645894f267702985549f
 2021-11-18 22:25:12 +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
Treehugger Robot
613ae210f6 Merge changes from topics "dist_for_goals", "mk2star" 
* changes:
  Runtime reporting of the conversion errors.
  Runtime support for dist-for-goals.
 2021-11-18 22:04:52 +00:00
Xin Li
9520b9c9ae [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 0d8b812568 -s ours 
am skip reason: Merged-In I42fd618b5a018abd57e6eab4fe4ed6ba9f70a235 with SHA-1 d540a6b9fe is already in history

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

Change-Id: I5ff34569b581a3b0585c45089b7d4db53781502b
 2021-11-18 22:00:56 +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
c4fe106fbc Merge changes from topic "servicemanager-recovery" am: 351cd2e489 am: 207e7372e7 am: c0802aa2f5 am: b384b246f4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1891531

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

Change-Id: I08f2d727d67a0ecebeff1f1364ed804e6dd02aa6
 2021-11-18 05:52:38 +00:00
Yifan Hong
b384b246f4 Merge changes from topic "servicemanager-recovery" am: 351cd2e489 am: 207e7372e7 am: c0802aa2f5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1891531

Change-Id: I76a829a18323fc01a9224e3696c32f1a63e8c8f8
 2021-11-18 05:34:47 +00: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
c0802aa2f5 Merge changes from topic "servicemanager-recovery" am: 351cd2e489 am: 207e7372e7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1891531

Change-Id: Ie0e2cf7a90c7ad127a6fa0a6b42e078446bc954f
 2021-11-18 05:18:00 +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
207e7372e7 Merge changes from topic "servicemanager-recovery" am: 351cd2e489 
Original change: https://android-review.googlesource.com/c/platform/build/+/1891531

Change-Id: Ief0f1635186a601d1875189aff0523e323486a8a
 2021-11-18 05:01:38 +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
280f5710f1 Merge "Add notdir implementation" am: dacbe7a5a2 am: f0cd91219d am: 74d752a5ea am: 71a2325008 
Original change: https://android-review.googlesource.com/c/platform/build/+/1892961

Change-Id: I8fada2577717facd5ca561a3e3cf985d21ff20df
 2021-11-17 21:59:46 +00: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
f0cd91219d Merge "Add notdir implementation" am: dacbe7a5a2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1892961

Change-Id: I0ef3169d862bf1a767af04dfec164c6e6de05fdf
 2021-11-17 21:15:52 +00:00
Treehugger Robot
dacbe7a5a2 Merge "Add notdir implementation" 2021-11-17 20:58:24 +00:00