tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
73306 commits 1 branch 0 tags 119 MiB
Commit graph

73306 commits

This branch
This branch
All branches
Author SHA1 Message Date
Devin Moore
6363a04e79 Merge changes from topic "init_boot_img" 
* changes:
  Update releasetools for new init_boot.img
  Build a new init_boot.img that contains the boot ramdisk
 2021-12-22 23:21:17 +00:00
Treehugger Robot
e685560087 Merge "Update comments for Makefile variables about APEX jars." 2021-12-22 18:37:28 +00:00
Treehugger Robot
3e315b9afc Merge "Fix make conditional" 2021-12-22 17:53:54 +00:00
Jiakai Zhang
49377db572 Update comments for Makefile variables about APEX jars. 
Modules available in Q should not add new entries to
PRODUCT_APEX_*_JARS. Otherwise, there will be problems when a Q device
gets new modules and then OTAs to S, in which case, the device will have
the S version of SdkExtension (because SdkExtension is not available in
Q, see go/mainline-ota-problem), and the S version of SdkExtension
cannot consume those new entries correctly.

Bug: 203198541
Test: N/A
Change-Id: I15367ca59a06b4ee5fdb3803f2e4615b5d03b458
 2021-12-22 13:38:17 +00:00
Ayush Sharma
9d68bcd762 Merge "Revert "Removing gsi_keys.mk"" 2021-12-22 12:08:53 +00:00
Ayush Sharma
0ab9187f01 Revert "Removing gsi_keys.mk" 
This reverts commit 5d2cf578d6.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_sc-qpr1-dev-plus-aosp&target=build_test3&lkgb=8021524&lkbb=8021634&fkbb=8021569, bug https://buganizer.corp.google.com/issues/211737534

Bug: 211737534
Change-Id: I40e8dce5d87a1ba08a6f100fc2af92dd94fd2d5c
 2021-12-22 11:56:11 +00:00
Treehugger Robot
09d30489b3 Merge "Removing gsi_keys.mk" 2021-12-22 09:27:55 +00:00
Treehugger Robot
ceb81e2bef Merge "Fix some python2/3 migration issues" 2021-12-22 06:33:32 +00:00
Treehugger Robot
01ca0d0c5e Merge changes I8d60efc5,Ie291ea87 
* changes:
  SignApk - change signature of readPassword to use char[] instead
  SignApk - use existing password mechanism when using keystore
 2021-12-22 06:23:19 +00:00
Bowgo Tsai
5d2cf578d6 Removing gsi_keys.mk 
It's no longer required to install the compliance GSI
public keys into the ramdisk. Those public keys just need
to be included in the VTS test suite for GSI verification.

Bug: 176869478
Test: TreeHugger
Change-Id: I26c4a1c7dba28a3c8cf88af64d8539fdc23a4f28
 2021-12-22 13:11:32 +08:00
Treehugger Robot
cf7300e9c2 Merge "Update comment up to date" 2021-12-22 00:38:22 +00:00
Dan Willemsen
1637c37d21 Fix make conditional 
`ifeq (foo,foo,)` is treated like `foo == foo,` which is not what we
want here, we want to clear this variable for user builds.

Change-Id: I57f92c7267102c9f3ac2b0130228de0b3036ac66
 2021-12-21 21:54:19 +00:00
Kelvin Zhang
0d0ca5d6a0 Fix some python2/3 migration issues 
Exception objects don't necessarily have a .message member, use str()
instead.

Test: th
Change-Id: I57b68dff1ace4937d6ef3b7c564f031e219491b1
 2021-12-21 12:31:55 -08:00
Inseob Kim
f6e4b7b769 Merge "Add sepolicy prebuilt dirs and variables to config" 2021-12-21 07:09:58 +00:00
Inseob Kim
e7b222aa9e Update comment up to date 
nonplat* is renamed to vendor*.

Bug: 210536608
Test: N/A
Change-Id: Ief699bf11395a5b0d9bee22220c09acac6e450f2
 2021-12-21 15:57:03 +09:00
Xin Li
3aec887b7e Merge "Merge SP1A.211205.008" 2021-12-21 05:02:44 +00:00
Treehugger Robot
7dac6abb9a Merge "Add symlink for system_dlkm modules" 2021-12-21 01:02:38 +00:00
Inseob Kim
bfe25fe702 Add sepolicy prebuilt dirs and variables to config 
These are used when we build vendor sepolicy against old plat sepolicy.

Bug: 33691272
Test: build
Change-Id: I847108539b3b9d7d25c0fad9eddc017275a564be
 2021-12-21 09:50:22 +09:00
Xin Li
90df2b43bc Merge SP1A.211205.008 
Bug: 205056467
Merged-In: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
Change-Id: Ic9d5fe40d265ef8002ccbcf3182a2fb8b6239135
 2021-12-20 14:07:52 -08:00
Devin Moore
afdd7c74bc Update releasetools for new init_boot.img 
This new init_boot.img contains the ramdisk that used to reside in the
boot.img file.

Test: set BOARD_PREBUILT_INIT_BOOT_IMAGE to an external init_boot.img
      - Check that "m" pulls in the init_boot.img to
      out/target/product/vsoc_x86_64/
      - Check that "m dist" adds the init_boot.img to
      aosp_cf_x86_64_phone-img-eng.devinmoore.zip
Test: atest --host releasetools_test
Bug: 203698939
Change-Id: If7ef2cf093e5e525529c7c44333c0f40f6ba0764
 2021-12-20 20:54:23 +00:00
Devin Moore
380d9e445c Build a new init_boot.img that contains the boot ramdisk 
This ramdisk used to be in boot.img, and is now placed into this new
init_boot.img instead.
This new image is used for a new init parition to seperate Android
platform artifacts from the kernel artifacts in boot.img.

Test: boot Cuttlefish
Bug: 203698939

Change-Id: Iaaf82486259979ab728730ce72a4e847ae005c18
 2021-12-20 20:54:14 +00:00
Ramji Jiyani
f9ce357613 Add symlink for system_dlkm modules 
Create symlinks for system_dlkm on devices with a
system_dlkm partition:

/system/lib/modules -> /system_dlkm/lib/modules

Bug: 200082547
Test: Manual boot with CF
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I8ddf340425cf92aa234f93f6b31bfd51cfa9c3f3
 2021-12-20 19:52:40 +00:00
Cole Faust
bd99de67c6 Merge "Export words function" 2021-12-16 21:16:49 +00:00
Treehugger Robot
32085e7bd7 Merge "Preserve all COMPATIBILITY_SUITES values in module-info" 2021-12-16 01:29:59 +00:00
Treehugger Robot
06c7e31f01 Merge "Update vndk list with dice hal libraries." 2021-12-16 00:16:45 +00:00
Cole Faust
12beaaf4ac Merge "Create $(findstring) starlark implementation" 2021-12-15 21:32:27 +00:00
Gabriel Biren
23e4ccd2ba Merge "Add Wifi supplicant AIDL interface support." 2021-12-15 21:13:41 +00:00
Inseob Kim
32961d0203 Merge changes I6f61a908,Iafd22881 
* changes:
  fsverity_metadata: Support PEM key
  Add fsverity_metadata_generator helper binary
 2021-12-15 06:03:31 +00:00
Inseob Kim
067492988a fsverity_metadata: Support PEM key 
When we have a PEM key, we don't need the process converting a DER key
to PEM format, but we just need to use the PEM key as-is.

Bug: 205987437
Test: build and manual test
Change-Id: I6f61a9088efc0f7193737d3c33b8cfde399b2b6f
 2021-12-15 09:41:39 +09:00
Inseob Kim
2d03493341 Add fsverity_metadata_generator helper binary 
Making this a host tool will help users generate their own fsverity
metadata easily.

Bug: 205987437
Test: m fsverity_metadata_generator and run it
Change-Id: Iafd228815a74d298d87ca1466c6909c0d24c5874
 2021-12-15 09:41:29 +09:00
Xin Li
46c84edacf Merge "Merge Android 12 QPR1" 2021-12-14 20:26:44 +00:00
Xin Li
0a9962fd9e Merge Android 12 QPR1 
Bug: 210511427
Merged-In: Ib836574268ae722da7a06d53d2014daa5877a991
Change-Id: Ic04e8e0274868bc7ccf3ac454ed0217beff382a0
 2021-12-14 08:38:55 -08:00
Yi-yo Chiang
90b0039a9d Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" 2021-12-14 11:39:03 +00:00
yangbill
6dd962fdda Preserve all COMPATIBILITY_SUITES values in module-info 
Extend COMPATIBILITY_SUITES in module-info to avoid overwriting previous
values. In particular, this happens for the `host-unit-tests` suite
which is automatically added by Soong rules only to be clobbered by the
modules that have both device and host variants.

Bug: 209806322
Test: source build/envsetup.sh ; lunch aosp_cf_x86_64_phone ;
      m out/target/product/vsoc_x86_64/module-info.json
Change-Id: I56a2d4c9786ed3da1e788ba211ec1bcaa6559549
 2021-12-14 05:54:30 +00:00
Cole Faust
4db91af70c Create $(findstring) starlark implementation 
Bug: 201700692
Test: go test in other cl in the topic
Change-Id: Ibe7d600c9fe5335a1277e1572aa52f6c512c2951
 2021-12-13 16:35:54 -08:00
Inseob Kim
c95816ce4b Merge "Refactor sepolicy version related codes" am: e23891877c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1916858

Change-Id: Ib836574268ae722da7a06d53d2014daa5877a991
 2021-12-13 04:13:32 +00:00
Inseob Kim
e23891877c Merge "Refactor sepolicy version related codes" 2021-12-13 03:57:36 +00:00
Treehugger Robot
49da1ac76c Merge "Revert^2 "Reuse license metadata files from Soong"" am: f13d0b2f22 
Original change: https://android-review.googlesource.com/c/platform/build/+/1918950

Change-Id: I5b572989961bf849cedd2da802b72361ef5fd778
 2021-12-11 03:48:24 +00:00
Treehugger Robot
f13d0b2f22 Merge "Revert^2 "Reuse license metadata files from Soong"" 2021-12-11 03:32:18 +00:00
Colin Cross
2e075808dd Merge "Revert "Reuse license metadata files from Soong"" am: 91a9483e87 
Original change: https://android-review.googlesource.com/c/platform/build/+/1918946

Change-Id: I85bbf851be4f5d2d3884f2c4652e32b0bcbd59b3
 2021-12-10 23:20:49 +00:00
Colin Cross
71d9919322 Revert^2 "Reuse license metadata files from Soong" 
81b167693f

Change-Id: Iff45cffb1f2b9d01cec70d96e34f46d35bb37842
 2021-12-10 23:05:02 +00:00
Colin Cross
91a9483e87 Merge "Revert "Reuse license metadata files from Soong"" 2021-12-10 23:04:45 +00:00
Colin Cross
81b167693f Revert "Reuse license metadata files from Soong" 
Revert "Escape Host*Variable contents"

Revert submission 1899703

Reason for revert: b/210158272
Reverted Changes:
I142c19284:Reuse license metadata files from Soong
Ife89b8f23:Add dependency license annotations
I8e7410837:Build license metadata files in Soong

Change-Id: Id9d66c01453aebe8a52eaa6628e9933a990d4c2f
 2021-12-10 23:03:08 +00:00
Cole Faust
98a7011088 Merge "Strip ODM_MANIFEST_SKUS" am: 01e022369b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1917097

Change-Id: I37ee8f0df0bcb212e0fc3add6b069e5857614747
 2021-12-10 22:05:31 +00:00
Colin Cross
b48261121e Merge "Reuse license metadata files from Soong" am: 6cf8ec77cc 
Original change: https://android-review.googlesource.com/c/platform/build/+/1900116

Change-Id: Id5db06a34777ff0a2bca39ffa0e083ca2a131a3d
 2021-12-10 22:04:39 +00:00
Cole Faust
01e022369b Merge "Strip ODM_MANIFEST_SKUS" 2021-12-10 22:02:22 +00:00
Colin Cross
6cf8ec77cc Merge "Reuse license metadata files from Soong" 2021-12-10 21:43:49 +00:00
Akilesh Kailash
7260b087ea Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I55d5d4da987da73432f31f68c135903f725fd6fd
 2021-12-10 19:58:12 +00:00
Akilesh Kailash
3f5f0b306d Merge "Enable userspace snapshots for OTA" 2021-12-10 19:44:48 +00:00
Janis Danisevskis
f0335310f7 Update vndk list with dice hal libraries. 
Bug: 198197213
Test: N/A
Change-Id: Ib199c5c18438b0d62ec5d6619ce9708c71ecac22
 2021-12-10 09:35:16 -08:00