Commit Graph

58043 Commits

Author SHA1 Message Date
Yo Chiang
96949d3904 Define PRODUCT_SYSTEM_* props for mainline_system
These properties, namely:

- PRODUCT_SYSTEM_NAME
- PRODUCT_SYSTEM_BRAND
- PRODUCT_SYSTEM_MANUFACTURER
- PRODUCT_SYSTEM_MODEL
- PRODUCT_SYSTEM_DEVICE

propagate into /system/build.prop as ro.product.system.* and can
identify if the /system partition is mainline_system.
These don't modify other ro.product.* properties that are defined in
partitions other than /system.

Bug: 110206836
Bug: 146191296
Test: lunch mainline_system_arm64-userdebug; m
Test: lunch aosp_arm64-userdebug; m
Test: Two products must have same PRODUCT_SYSTEM_* props
Change-Id: I300579d555d269481635237fb02aab5db71a510d
2019-12-15 15:11:53 +00:00
android-build-team Robot
30f0254b87 Make change and version bump to QQ2A.191215.001
Change-Id: I881e29df087606863ead612f9db84c0b724d142f
2019-12-15 00:21:20 +00:00
Automerger Merge Worker
265572c081 Merge "Write list of copy headers" am: 6fe297fcc5 am: 3830d8ae0d
Change-Id: I97e8e66e6fd747066014296cb63b0b7758991e2e
2019-12-15 00:21:15 +00:00
Dan Willemsen
3830d8ae0d Merge "Write list of copy headers"
am: 6fe297fcc5

Change-Id: Ib2b5e2daa17ba392264edd44c03a6c0e8a16b69d
2019-12-14 16:08:06 -08:00
Dan Willemsen
6fe297fcc5 Merge "Write list of copy headers" 2019-12-15 00:04:15 +00:00
Colin Cross
66ce55d90d Remove Soong intermediates after renaming core variant
Bug: 142286466
Test: m
Change-Id: Ib10a9cf8a8c9109279523f811764afff34969368
Merged-In: Ib10a9cf8a8c9109279523f811764afff34969368
(cherry picked from commit c293f9583e4ac726c1c44406725e2bbf7d3efdad)
2019-12-13 20:46:35 -08:00
Dan Willemsen
79a0caff35 Write list of copy headers
So that soong_ui can remove obsolete headers that have been removed.

Test: cat out/target/product/crosshatch/.copied_headers_list
Test: cat out/target/product/generic/.copied_headers_list
Change-Id: I7df8029c1f2ed630d35c357f94e5dfb668e5824f
2019-12-13 19:35:05 -08:00
Automerger Merge Worker
b25e28e3c9 Merge "Initialize common_proguard_flags for each module" am: 793147469e am: 25ed10e122
Change-Id: I91c606cf7191ddc0974b1bf1583880cc099a393e
2019-12-14 03:15:55 +00:00
Colin Cross
25ed10e122 Merge "Initialize common_proguard_flags for each module"
am: 793147469e

Change-Id: Ib88a684a67ecc89927c0593fe97e85028bfbcbf7
2019-12-13 18:55:38 -08:00
Treehugger Robot
793147469e Merge "Initialize common_proguard_flags for each module" 2019-12-14 02:52:59 +00:00
android-build-team Robot
58ee75e746 Make change and version bump to QQ2A.191214.001
Change-Id: I227c487d4d3be023b533dc0e5c083eacf1d50357
2019-12-14 02:19:58 +00:00
Colin Cross
2a40672597 Initialize common_proguard_flags for each module
Id938aa35e87c9c69769a3184dfea06fd02299688 removed the initial
assignment to common_proguard_flags, which both makes it grow as
each module is parsed and also turns it into a lazily evaluated
variable.  That causes the flags passed to R8 to be the flags
computed for the current module multiplied by the number of previously
parsed modules.

Fixes: 146150575
Test: m checkbuild
Change-Id: I87c9625496f482896be6867124f2f12ff662cd57
2019-12-13 16:23:11 -08:00
Automerger Merge Worker
4f1b16f6aa Merge "Revert "Remove ro.apex.updatable=false in GSI"" am: 565bb632c7 am: 6d349fe4cc
Change-Id: I0331be1cf5112d10a5defba3d138a0e99c35bbb9
2019-12-14 00:09:07 +00:00
SzuWei Lin
6d349fe4cc Merge "Revert "Remove ro.apex.updatable=false in GSI""
am: 565bb632c7

Change-Id: Ib5f8d0db7d709384aba2be23f785974a637dd82d
2019-12-13 15:58:42 -08:00
Automerger Merge Worker
3adc6575cf [automerger skipped] Merge "Make AOSP master use AOSP.MASTER as BUILD_ID." am: ed7d5f12e3 am: c6e5429a53 -s ours
am skip reason: Change-Id I1d718255fc30b255fc83ac79233ec440074084c4 with SHA-1 b5144d4c59 is in history

Change-Id: Idcf5b5ee893fb5a08a44b0326efacd674506a81a
2019-12-13 23:22:27 +00:00
Treehugger Robot
565bb632c7 Merge "Revert "Remove ro.apex.updatable=false in GSI"" 2019-12-13 23:15:51 +00:00
Xin Li
c6e5429a53 Merge "Make AOSP master use AOSP.MASTER as BUILD_ID."
am: ed7d5f12e3

Change-Id: I19cffa65f42c92e1b39622e736257230c711182d
2019-12-13 15:00:10 -08:00
Treehugger Robot
ed7d5f12e3 Merge "Make AOSP master use AOSP.MASTER as BUILD_ID." 2019-12-13 22:49:08 +00:00
Automerger Merge Worker
31a06d3b93 Merge "sign_target_apks: Add networkstack to default key_map" am: d6aa90ce9a am: d9055ab8ab
Change-Id: I0b368f7794dec38cdcefe551e2e011b84327a76b
2019-12-13 22:43:09 +00:00
Oleh Cherpak
d9055ab8ab Merge "sign_target_apks: Add networkstack to default key_map"
am: d6aa90ce9a

Change-Id: Ie9b37436b0d0c1d581a54a66455f71b617cc3e32
2019-12-13 14:30:03 -08:00
Treehugger Robot
d6aa90ce9a Merge "sign_target_apks: Add networkstack to default key_map" 2019-12-13 22:22:08 +00:00
Automerger Merge Worker
5feb2e79a3 Merge changes from topic "gsi-with-flattened-apexes" am: b3bff1d203 am: 66ee21cedd
Change-Id: I5a1c446abab9e0e8dec7dca027bc757f8b34d14b
2019-12-13 21:56:16 +00:00
Dario Freni
66ee21cedd Merge changes from topic "gsi-with-flattened-apexes"
am: b3bff1d203

Change-Id: I08a6027d8b8ceb5466f6c295ea4cd0c2af89a21b
2019-12-13 13:35:05 -08:00
Treehugger Robot
b3bff1d203 Merge changes from topic "gsi-with-flattened-apexes"
* changes:
  Enable updatable-apex.mk for mainline_system
  Add PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
2019-12-13 21:10:56 +00:00
Automerger Merge Worker
ab87bb98f9 Merge "Add AFTL relevant options to OPTIONS in common.py." am: 9088392b6b am: f70dac0fc9
Change-Id: I50d07afc2b0e28819711624a6ddde852c4542ab1
2019-12-13 06:26:04 +00:00
Automerger Merge Worker
8afcfa3877 Merge "Add mainline_system_x86_64 product" am: 078b1598ff am: c47de5cb83
Change-Id: Ic138d068d98da417b6bc808e579b5741307600c4
2019-12-13 06:25:03 +00:00
Dan Austin
f70dac0fc9 Merge "Add AFTL relevant options to OPTIONS in common.py."
am: 9088392b6b

Change-Id: Ie61676023965423d631b3ac5725e5d1f8a9910ea
2019-12-12 22:08:58 -08:00
Yo Chiang
c47de5cb83 Merge "Add mainline_system_x86_64 product"
am: 078b1598ff

Change-Id: I1a072bac757bb60a1f2221c59fc61f8c9a650526
2019-12-12 22:07:30 -08:00
Treehugger Robot
9088392b6b Merge "Add AFTL relevant options to OPTIONS in common.py." 2019-12-13 05:54:58 +00:00
Yo Chiang
078b1598ff Merge "Add mainline_system_x86_64 product" 2019-12-13 05:22:15 +00:00
Automerger Merge Worker
6686dfe7d9 Merge "Adding developer_gsi_keys.mk" am: dad976ffcb am: c58307824a
Change-Id: Ic2d30adc0868990bce0d417d7c3557e5334ba7f5
2019-12-13 03:41:03 +00:00
Bowgo Tsai
c58307824a Merge "Adding developer_gsi_keys.mk"
am: dad976ffcb

Change-Id: I88fe10b2c23cdaa9b301ed100b35893d27509bf8
2019-12-12 19:19:52 -08:00
Treehugger Robot
dad976ffcb Merge "Adding developer_gsi_keys.mk" 2019-12-13 03:13:02 +00:00
android-build-team Robot
d70b8c7ab6 Make change and version bump to QQ2A.191213.001
Change-Id: I57decea783d6fc3cbef2bf2344ff61a36f18e9f8
2019-12-13 02:20:47 +00:00
Automerger Merge Worker
b960782c52 Merge "Add linkerconfig to recovery" am: 0542582560 am: 3701950613
Change-Id: If0bf79bfe405a6db525fb9eb3de0bf44caad5b0b
2019-12-13 01:59:36 +00:00
Kiyoung Kim
3701950613 Merge "Add linkerconfig to recovery"
am: 0542582560

Change-Id: I289d6441bf7ae15291d881ef12dd4686a841edee
2019-12-12 17:13:52 -08:00
Kiyoung Kim
0542582560 Merge "Add linkerconfig to recovery" 2019-12-13 01:09:58 +00:00
Dan Austin
5290364e9b Add AFTL relevant options to OPTIONS in common.py.
Adds AFTL relevant options in preparation for avbtool changes. The
options are:
aftl_server: A string representing the URL of the transparency log.
aftl_key_path: The path to the public key associated with the
transparency log (in PEM format).
aftl_manufacturer_key_path: The path to the key associated with the
manufacturer for AFTL message signing.
aftl_signing_helper: The signing helper for use with AFTL message
signing.

Change-Id: I73d466f24b171c16dbdaa40c589779bed52be551
Test: Ran add_img_to_target_files with all AFTL options.
Bug: 138779249
2019-12-12 15:48:52 -08:00
Dario Freni
99f5e40137 Enable updatable-apex.mk for mainline_system
Test: presubmit passes
Bug: 145791146
Change-Id: I87fb58c4d8d3d02d46af467d62222782658e73dc
2019-12-12 17:21:17 +00:00
Bowgo Tsai
01c6f6f215 Adding developer_gsi_keys.mk
OEMs who are willing to support booting the public Developer-GSI
in locked state can add the following line into a device.mk to include
the corresponding public keys into their first-stage ramdisk.

   $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)

Bug: 144399552
Test: make checks $OUT/ramdisk/avb/.
Change-Id: I8fdefa0fb26c2d385dda1f72503d12e6fc306694
2019-12-12 21:32:49 +08:00
android-build-team Robot
9d32d173a9 Make change and version bump to QQ2A.191212.001
Change-Id: I4fa1314df170c5984d7c5af5942085287f1fc4d5
2019-12-12 02:20:08 +00:00
Automerger Merge Worker
f6f2939503 Merge "releasetools: Generalize base_fs_file handling." am: 066fac7c8c am: 0f4e7f82bc
Change-Id: I61b534b0adae774949f55e70febf699c925ab134
2019-12-11 23:05:00 +00:00
Oliver Nguyen
f0fdf80540 Add CLANG_COVERAGE build flag to soong config.
Bug: 143977934
Test: m CLANG_COVERAGE=true
Change-Id: Ief6302a1724a9e8d5bd1a48ded4eb7d15ddf18de
2019-12-11 14:58:53 -08:00
android-build-team Robot
be71df1cb3 Version bump to QQ2A.191211.002 [core/build_id.mk]
Change-Id: I41d4ca64268a8ea201553665ad6a3de651954e17
2019-12-11 22:49:21 +00:00
David Anderson
0f4e7f82bc Merge "releasetools: Generalize base_fs_file handling."
am: 066fac7c8c

Change-Id: I3bbf8e9ed2d3091136c88399fa952bb347dc8907
2019-12-11 14:36:20 -08:00
David Anderson
066fac7c8c Merge "releasetools: Generalize base_fs_file handling." 2019-12-11 22:32:07 +00:00
David Anderson
0ec64ac0aa releasetools: Generalize base_fs_file handling.
Share the code to handle base_fs files rather than duplicate it for
system/vendor. At the same time, add support for system_ext and product
partitions.

Bug: 139201772
Test: manual test
Change-Id: Ib1b7c018c828901e24eefc01e3faead03e77bc2d
2019-12-11 22:32:00 +00:00
Jooyung Han
9efe534ef1 Add PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
For GSI targets, this variable is set true, and Soong will install both
"flattened" and "unflattened" APEXes together in /system_ext and /system
respectively.

Bug: 137802149
Test: lunch aosp_arm64-userdebug && m
  resulting apex images under /system/apex
  and flattened apexes under /system/system_ext/apex

Change-Id: Ib72d1b9dbd59727942da39323ee7e60ac6e14882
2019-12-12 02:04:43 +09:00
SzuWei Lin
c7f63dfeda Revert "Remove ro.apex.updatable=false in GSI"
This reverts commit d24bc21f06.

Reason for revert: Waiting relative feature done.

Change-Id: I455bcaaba567260197d8ebe88175a9d40fb49195
2019-12-11 07:07:46 +00:00
Automerger Merge Worker
ec95588134 Merge "Change all cf_common paths to cuttlefish paths" am: 3b500a7ec3 am: 85f60f8307
Change-Id: I18b7021f769b0adc775d622912aa773ff8874312
2019-12-11 04:22:02 +00:00