Commit Graph

57407 Commits

Author SHA1 Message Date
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
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
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
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
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
Automerger Merge Worker b5144d4c59 Merge "Add telephony-common, ims-common to telephony apex." am: 52df8f5154 am: 5d2a05f5a1
Change-Id: I1d718255fc30b255fc83ac79233ec440074084c4
2019-12-10 19:00:39 +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 d68d821009 Merge "Move to using full java-lib-files from stubs." am: ac3bf4e3a9
am: 09171641a3

Change-Id: I9ccdddf26512cd211e670e9461e0be1245f9a056
2019-12-09 20:57:54 -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
Amit Mahajan 13bc18a3ec Add telephony-common, ims-common to telephony apex.
Test: basic telephony sanity
Test: m com.android.telephony && adb install com.android.telephony.apex
Bug: 145555313
Change-Id: I5588f7615c45aac00eb00f436e15e8a1746d9ac6
2019-12-09 14:07:05 -08:00
Logan Chien 1429291d9f Enable prebuilt ELF check for all targets
This commit enables prebuilt ELF checks on ALL targets.

If this commit breaks your target, you may triage the breakage by adding
the following setting to your `BoardConfig.mk`:

    BUILD_BROKEN_PREBUILT_ELF_FILES := true

And then fix the problem with the instructions:

    https://source.android.com/devices/architecture/vndk/abi-use-check

Bug: 141176116
Bug: 145925470
Test: for t in ${ALL_TARGETS}; do lunch $t; make check-elf-files; done
Change-Id: I62e0269074afe1d685cb63d5f8953a2acf03f03e
2019-12-09 14:00:25 -08:00
Xin Li ef88d9cd99 Make qt-qpr1-dev-plus-aosp use AOSP.MASTER as BUILD_ID.
In ag/7020561, after branching of qt-dev, the BUILD_ID was changed to
"QT" and the change was tagged as "DO NOT MERGE" to prevent it flowing
into master.  However, because the -plus-aosp branches was using the
same API level and "DO NOT MERGE" will not be respected there, it would
eventually be merged to stage-aosp-master and promoted to AOSP master.

Address this by using AOSP.MASTER which will cause a merge conflict when
the merge happens.

Bug: 145935472
Change-Id: Iaa17a2c29f1f3cf28f28761a18b0d480b0253fac
Merged-In: I5c28225d61996cb719ae384d7b0828776e84f8d5
2019-12-09 13:28:32 -08:00
Amit Mahajan 69a527d108 Merge "Create telephony apex." am: 1b9fd38513
am: c1ddc3adbc

Change-Id: I27b705b64d3c455fe68f4fdf34c50b620d4b92f1
2019-12-09 11:00:58 -08:00
Amit Mahajan c1ddc3adbc Merge "Create telephony apex."
am: 1b9fd38513

Change-Id: I11d3daaf3a2739342a0942835a97dc6a65bbc68b
2019-12-09 10:59:00 -08:00
Treehugger Robot 1b9fd38513 Merge "Create telephony apex." 2019-12-09 18:52:05 +00:00
Kiyoung Kim d7c866cd45 Add linkerconfig to recovery
Add linkerconfig to recovery so it can be executed to generate
ld.config.txt in recovery mode

Bug: 139638519
Test: Tested from crosshatch recovery
Change-Id: I8dd2a8833332c8e583632700d1ba46d9a3b1fc94
2019-12-09 14:59:15 +09:00
Mitchell Wills 1483988117 Merge "Fix comment to reflect that the value passed to head is actually the size" am: 04175fa5fc
am: 91a3c6f217

Change-Id: I99d91e3f8750d1a9b25dc6c03ef274fd29b0b010
2019-12-07 00:29:33 -08:00
Mitchell Wills 91a3c6f217 Merge "Fix comment to reflect that the value passed to head is actually the size"
am: 04175fa5fc

Change-Id: Ibb9b900018e55bff15dbe57e24aadf0fdb3c8bb9
2019-12-07 00:27:33 -08:00
Treehugger Robot 04175fa5fc Merge "Fix comment to reflect that the value passed to head is actually the size" 2019-12-07 08:13:46 +00:00
Mitchell Wills f8a39f32d7 Merge "Use bash instead of sh in self extracting archive" am: 0c4f577f1c
am: 0ef7856a56

Change-Id: I403163e2dfe4f2c43aca38a681d121cdc9ddcf97
2019-12-06 20:04:30 -08:00
Mitchell Wills 0ef7856a56 Merge "Use bash instead of sh in self extracting archive"
am: 0c4f577f1c

Change-Id: I93028e0ed9ac3bd4c99d3a24390d052019736d1f
2019-12-06 20:02:31 -08:00
Mitchell Wills a428b092e6 Fix comment to reflect that the value passed to head is actually the size
There is no functional change

Bug: 130257221
Test: generated an archive using the script and ran the result
Change-Id: I946f2827a9519873be2173fc50d9bc1cc46a326f
2019-12-06 19:13:21 -08:00
Mitchell Wills 0c4f577f1c Merge "Use bash instead of sh in self extracting archive" 2019-12-07 03:12:47 +00:00
Mitchell Wills 032de6765b Use bash instead of sh in self extracting archive
`echo -n` and `read` seems to not work the same on mac

Bug: 130257221
Test: generated an archive using the script and ran the result on linux and mac
Change-Id: I129090ccf50781b748bff9a5c7890824d2670ad4
2019-12-06 16:55:24 -08:00
Tobias Thierer d6067c1886 Merge "logtags: Support # line comments." am: cfd25567e6
am: 95370d66be

Change-Id: I18db6c12656040db915c467987302f8f8abb5d4c
2019-12-06 15:18:47 -08:00