Commit Graph

57122 Commits

Author SHA1 Message Date
Luke Huang 132c0346e2 Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system."
am: ced27c4c60

Change-Id: I7a67c1cc12d432b7c7422d7184bf9f13db20c8aa
2019-12-16 06:48:35 -08:00
Luke Huang ced27c4c60 Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system." 2019-12-16 14:39:02 +00:00
Luke Huang 723ff8274d Add com.android.cronet APEX and org.chromium.net.cronet to base_system.
com.android.cronet will be shipped as a mainline
module in APEX format.

org.chromium.net.cronet is a java_sdk_library used to provide
Cronet API to apps.

Bug: 139397529
Test: Built and installed apex on device
Change-Id: Icff7ded02e360f2df9dfe3ac7185cf7f0034d014
2019-12-16 20:57:05 +08:00
Anton Hansson 37a037e05e Verify updatable jars are in PRODUCT_BOOT_JARS
A jar should never be in just the updatable list.

Test: treehugger
Change-Id: I806eb2d00502f98aa2c40fba3fc644cfddc64ad9
2019-12-16 11:27:18 +00:00
Yo Chiang 3bbbe2d5b9 Revert "Revert "Remove ro.apex.updatable=false in GSI""
This reverts commit c7f63dfeda.

Reason for revert: b/145963716

Change-Id: I0f6a9c26b342a27dfebc0494a255492c838c09f5
2019-12-16 08:38:59 +00:00
Bowgo Tsai 07e91398d7 Merge "Adding missing dependencies for vbmetaimage-nodeps"
am: 8e3bc2d4ce

Change-Id: Iee7b6da732e95c6357f72c65a7deec1527a2eb4d
2019-12-15 21:04:57 -08:00
Treehugger Robot 8e3bc2d4ce Merge "Adding missing dependencies for vbmetaimage-nodeps" 2019-12-16 04:47:56 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
Ram Muthiah 85f60f8307 Merge "Change all cf_common paths to cuttlefish paths"
am: 3b500a7ec3

Change-Id: Ifa8a0cb0fd1dc82f22966b158d82f363f3f3a0ac
2019-12-10 20:02:57 -08:00
Ram Muthiah 3b500a7ec3 Merge "Change all cf_common paths to cuttlefish paths" 2019-12-11 03:26:48 +00:00
Xin Li 75f604f581 Make AOSP master use AOSP.MASTER as BUILD_ID.
Bug: 145935472
Change-Id: I8a5443ca59414ceccd4bd75e954793678f64e427
Merged-In: I1d718255fc30b255fc83ac79233ec440074084c4
2019-12-10 16:21:50 -08:00
Ram Muthiah ed9d7bf9e1 Change all cf_common paths to cuttlefish paths
Merging cuttlefish_common master into cuttlefish master

Bug: 143774116
Test: Treehugger
Exempt-From-Owner-Approval: cf-only change
Change-Id: I9911ba93e642ac1909be45334a5f45fc95a4ab48
Merged-In: I9911ba93e642ac1909be45334a5f45fc95a4ab48
2019-12-11 00:06:30 +00:00
Amit Mahajan 5d2a05f5a1 Merge "Add telephony-common, ims-common to telephony apex."
am: 52df8f5154

Change-Id: I3ef3d405cedd08931ac29b6ae7731e4fb272c326
2019-12-10 10:58:34 -08:00
Treehugger Robot 52df8f5154 Merge "Add telephony-common, ims-common to telephony apex." 2019-12-10 18:52:38 +00:00
Oleh Cherpak 982e608085 sign_target_apks: Add networkstack to default key_map
Test: run cts -m CtsSecurityTestCases -t \
	android.security.cts.PackageSignatureTest#testPackageSignatures
Bug: 145955635
Change-Id: I1a1498562e2b5983010cb98e3edcd03ceb2cce19
Signed-off-by: Oleh Cherpak <oleh.cherpak@globallogic.com>
2019-12-10 15:03:57 +00:00
Bowgo Tsai 6a4eaa57b9 Adding missing dependencies for vbmetaimage-nodeps
Bug: 143513520
Test: `make vbmetaimage-nodeps` then checks the value of
      PRIVATE_AVB_VBMETA_SIGNING_ARGS appears in ./out/verbose.log.gz

Change-Id: I2eac2b2d319a46f3c3ecb56df8c6b56925a4d596
2019-12-10 15:08:24 +08:00
Aurimas Liutikas 09171641a3 Merge "Move to using full java-lib-files from stubs."
am: ac3bf4e3a9

Change-Id: I97c5052cadf9109ad9da87b7413a6daf5b82c47e
2019-12-09 20:55:54 -08:00
Treehugger Robot ac3bf4e3a9 Merge "Move to using full java-lib-files from stubs." 2019-12-10 04:49:28 +00:00
Aurimas Liutikas 743c9c3b6b Move to using full java-lib-files from stubs.
java-lib-header-files (turbine) differ from java-lib-files (actual metalava
output) in how the private constructors are showing up in these jars.

in classes.jar android/telephony/AccessNetworkConstants.class
package android.telephony;

public final class AccessNetworkConstants {
    private AccessNetworkConstants() {
        throw new RuntimeException("Stub!");
    }
}

in classes-header.jar android/telephony/AccessNetworkConstants.class
package android.telephony;

public final class AccessNetworkConstants {
}

As you can see, turbine seems to skip adding the private constructor,
which means that it becomes public.

Bug: 145933077
Test: m out/target/common/obj/api.xml
      out/target/common/obj/api.xml -> no longer has public constructor
      for AccessNetworkConstants

Change-Id: Ie1763783667b41b9892c9c47e6b362d7962caf14
2019-12-09 16:36:15 -08:00