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

73594 commits

This branch
This branch
All branches
Author SHA1 Message Date
Treehugger Robot
676de41c33 Merge "--sign_tool is an optional flag applicable to virtApex." am: ff3a1c73cf am: aabf327615 
Original change: https://android-review.googlesource.com/c/platform/build/+/1933021

Change-Id: If3fb5c7ab8c9301f3d5875a88559a317dd741549
 2021-12-24 11:39:35 +00:00
Treehugger Robot
aabf327615 Merge "--sign_tool is an optional flag applicable to virtApex." am: ff3a1c73cf 
Original change: https://android-review.googlesource.com/c/platform/build/+/1933021

Change-Id: I121cb833348795c7dc64ef774456da8e171fb5bc
 2021-12-24 11:22:08 +00:00
Treehugger Robot
ff3a1c73cf Merge "--sign_tool is an optional flag applicable to virtApex." 2021-12-24 10:59:21 +00:00
Baligh Uddin
06cc018629 --sign_tool is an optional flag applicable to virtApex. 
For not virtApex, this results in a KeyError.
line 151, in <module>\n', '  File
"/usr/local/google/home/baligh/clients/goog/master/out/host/linux-x86/bin/sign_apex/sign_apex.py",
line 144, in main\n', "KeyError: 'sign_tool'\n"]

BUG: 193504286
Test: TH
Change-Id: Id982e5c57086ada78168163d2293813df121847d
 2021-12-24 06:17:47 +00:00
Jiyong Park
7563ad7b11 Merge "Reland: Add NEED_AIDL_NDK_PLATFORM_BACKEND" into sc-qpr1-dev-plus-aosp 2021-12-24 02:34:34 +00:00
Devin Moore
2bc48d1025 Merge changes from topic "init_boot_img" am: 6363a04e79 am: 1368d81efa 
Original change: https://android-review.googlesource.com/c/platform/build/+/1920818

Change-Id: Ibca1c0c3105c0d2ee53f7db6795ac567a17a0269
 2021-12-22 23:56:55 +00:00
Devin Moore
1368d81efa Merge changes from topic "init_boot_img" am: 6363a04e79 
Original change: https://android-review.googlesource.com/c/platform/build/+/1920818

Change-Id: Ib49ac64a178ce649011a20709e44c8f1f4837bb4
 2021-12-22 23:33:33 +00:00
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
dbe5fcc828 Merge "Update comments for Makefile variables about APEX jars." am: e685560087 am: 3cc272c031 
Original change: https://android-review.googlesource.com/c/platform/build/+/1931602

Change-Id: I77c3c8e180d1134db2cf86010954c16e1870d85e
 2021-12-22 19:19:19 +00:00
Treehugger Robot
3cc272c031 Merge "Update comments for Makefile variables about APEX jars." am: e685560087 
Original change: https://android-review.googlesource.com/c/platform/build/+/1931602

Change-Id: I11bff7adff7233683daa605bfc9c34d0d6cfcaf6
 2021-12-22 18:54:20 +00:00
Treehugger Robot
e685560087 Merge "Update comments for Makefile variables about APEX jars." 2021-12-22 18:37:28 +00:00
Treehugger Robot
f2bf87a8ff Merge "Fix make conditional" am: 3e315b9afc am: b5560e2fc4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1931200

Change-Id: I41dcc99125aa10d800c9df8cf83f308b085747d4
 2021-12-22 18:23:08 +00:00
Treehugger Robot
b5560e2fc4 Merge "Fix make conditional" am: 3e315b9afc 
Original change: https://android-review.googlesource.com/c/platform/build/+/1931200

Change-Id: I3a1ef516c731fa3fa3841a5a652bf2468c94c6cf
 2021-12-22 18:11:07 +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
f1974fe82c Merge "Revert "Removing gsi_keys.mk"" am: 9d68bcd762 am: 59e76276de 
Original change: https://android-review.googlesource.com/c/platform/build/+/1931081

Change-Id: I7ea72162f32a0da0f81d15804892bf9b47c21738
 2021-12-22 12:55:04 +00:00
Ayush Sharma
59e76276de Merge "Revert "Removing gsi_keys.mk"" am: 9d68bcd762 
Original change: https://android-review.googlesource.com/c/platform/build/+/1931081

Change-Id: I271c0e090a50e9677dbef558c75b1b8c397b43a0
 2021-12-22 12:24:04 +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
b350bf36ac Merge "Removing gsi_keys.mk" am: 09d30489b3 am: 139a73dcc0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1928391

Change-Id: I1e4738bee330e96b23ffa639dbc20b2dca652d75
 2021-12-22 10:14:21 +00:00
Treehugger Robot
139a73dcc0 Merge "Removing gsi_keys.mk" am: 09d30489b3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1928391

Change-Id: Ib1fe98216ba4103e68b0d962034e0fde8796fda8
 2021-12-22 09:48:23 +00:00
Treehugger Robot
09d30489b3 Merge "Removing gsi_keys.mk" 2021-12-22 09:27:55 +00:00
Treehugger Robot
949f4fc6b6 Merge "Fix some python2/3 migration issues" am: ceb81e2bef am: fa3f8bdd90 
Original change: https://android-review.googlesource.com/c/platform/build/+/1930407

Change-Id: I25547cf5d49e9cfb796fac5f039b0ba2f1513701
 2021-12-22 06:53:46 +00:00
Treehugger Robot
2cbdab25ed Merge changes I8d60efc5,Ie291ea87 am: 01ca0d0c5e am: 6a4a3d0ed7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1900893

Change-Id: Ic954a4f26ff1508d6b1c79922bd1f5ae5e9d2f4a
 2021-12-22 06:53:36 +00:00
Treehugger Robot
fa3f8bdd90 Merge "Fix some python2/3 migration issues" am: ceb81e2bef 
Original change: https://android-review.googlesource.com/c/platform/build/+/1930407

Change-Id: I975554291fe32041297a1249dd9ff11e37387f5f
 2021-12-22 06:36:45 +00:00
Treehugger Robot
6a4a3d0ed7 Merge changes I8d60efc5,Ie291ea87 am: 01ca0d0c5e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1900893

Change-Id: I0f7f932dd81dfd5c12e0861fb6d147efa28c90bc
 2021-12-22 06:36:35 +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
ba37412ac7 Merge "Update comment up to date" am: cf7300e9c2 am: a93b9ff575 
Original change: https://android-review.googlesource.com/c/platform/build/+/1928383

Change-Id: Iedf39242d7346ace096f2419ae38200ddf259d20
 2021-12-22 01:18:29 +00:00
Treehugger Robot
a93b9ff575 Merge "Update comment up to date" am: cf7300e9c2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1928383

Change-Id: I9bc579a9956b59a35dc97ab901aa2c9bc696f642
 2021-12-22 01:06:23 +00: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
8f45830c60 Merge "Add sepolicy prebuilt dirs and variables to config" am: f6e4b7b769 am: f6e08dcf68 
Original change: https://android-review.googlesource.com/c/platform/build/+/1926906

Change-Id: I81b5f37d9965b3dbe41792e003ebcde2d4b5ce39
 2021-12-21 07:23:39 +00:00
Xin Li
95997b0681 [automerger skipped] Merge "Merge SP1A.211205.008" am: 3aec887b7e am: bda6a28874 -s ours 
am skip reason: skipped by user delphij

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

Change-Id: Ie024411f5abe616564ee1265465284ae07497bef
 2021-12-21 07:20:49 +00:00
Inseob Kim
f6e08dcf68 Merge "Add sepolicy prebuilt dirs and variables to config" am: f6e4b7b769 
Original change: https://android-review.googlesource.com/c/platform/build/+/1926906

Change-Id: I65073069527242c153e01871b0d834cbcf3dfb5d
 2021-12-21 07:20:17 +00: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
bda6a28874 Merge "Merge SP1A.211205.008" am: 3aec887b7e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1930700

Change-Id: I89ad49f820c4ed39d40a479f7f586df967f68403
 2021-12-21 05:21:39 +00:00
Xin Li
3aec887b7e Merge "Merge SP1A.211205.008" 2021-12-21 05:02:44 +00:00
Treehugger Robot
4aaac8ce5d Merge "Add symlink for system_dlkm modules" am: 7dac6abb9a am: e5a33f0723 
Original change: https://android-review.googlesource.com/c/platform/build/+/1906557

Change-Id: I926187e478a0c67c3ce1de2ab1da4b9f7125cf6a
 2021-12-21 01:34:33 +00:00
Treehugger Robot
e5a33f0723 Merge "Add symlink for system_dlkm modules" am: 7dac6abb9a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1906557

Change-Id: I787321bc38a72cfda4caa9d520a520e113501856
 2021-12-21 01:22:40 +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
Savitha Gouda
6aa29d9a29 [automerger skipped] Update security string to 2022-02-01 am: dbca77790b am: 5aa365533b am: 4d389c976c am: 962fe3597e am: fd931df2df am: 794958fe8e -s ours am: c78d35a3dc -s ours 
am skip reason: Merged-In Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 with SHA-1 fdbbcabca3 is already in history

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

Change-Id: I41e6b8136b937eaaad51d441daef0da937fc119d
 2021-12-17 04:15:48 +00:00