Commit Graph

56862 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
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
Treehugger Robot dad976ffcb Merge "Adding developer_gsi_keys.mk" 2019-12-13 03:13:02 +00: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
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 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
Ram Muthiah 3b500a7ec3 Merge "Change all cf_common paths to cuttlefish paths" 2019-12-11 03:26:48 +00: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
Treehugger Robot 52df8f5154 Merge "Add telephony-common, ims-common to telephony apex." 2019-12-10 18:52:38 +00: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
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
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 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
Treehugger Robot cfd25567e6 Merge "logtags: Support # line comments." 2019-12-06 23:10:08 +00:00
Treehugger Robot 9e0b4ed82a Merge "Improve checks for include dirs outside the source tree" 2019-12-06 21:49:25 +00:00
Ian Kasprzak c99726bcf0 Merge "Include all system images in -with-license.sh" 2019-12-06 17:10:48 +00:00
Amit Mahajan 8c7ca1bc05 Create telephony apex.
Initial version includes StkLib. Other components will be added in
subsequent CLs.

Test: m com.android.telephony && adb install com.android.telephony.apex
Bug: 145555313
Change-Id: Ifa38d36ba36dbfa613bff9ac168af82b7d6886ee
2019-12-05 23:38:50 -08:00
Jooyung Han 39048511c2 Merge "Remove ro.apex.updatable=false in GSI" 2019-12-06 03:49:01 +00:00
Ivan Lozano deaf3fc74a Merge "Exclude dirs from binder interface whitelisting" 2019-12-06 02:25:10 +00:00
Ian Kasprzak 8f9b3c196c Include all system images in -with-license.sh
Rename artifact to not use -img- which conflicts w/ TF
test filters.

Bug: 125451157
Test: Verified phone flash works with new with-license artifact.
Change-Id: I7dd4eb17a24f1bf36926a83939f69681ff8b26ad
2019-12-05 15:51:24 -08:00
Calin Juravle 64daf2e02a Merge "Add art dexpreopt to boot.zip archive" 2019-12-05 22:11:28 +00:00
Dan Willemsen 0cb422f0e7 Improve checks for include dirs outside the source tree
See the Changes.md addition for more details.

Test: treehugger (build_test on downstream branches)
Change-Id: I6ad6b454a6fccf93772fda26cfc7dd6bbfc07c40
2019-12-05 13:11:04 -08:00
Yifan Hong dc0b50b2d5 Merge "Mark BOARD_HAL_STATIC_LIBRARIES as obsolete." 2019-12-05 20:11:32 +00:00
Ivan Lozano b18979aa20 Exclude dirs from binder interface whitelisting
Exclude vendor/ and hardware/ from the manually written binder interface
whitelist.

Bug: 136279235
Test: interfaces in excluded directories are not checked against whitelist.
Change-Id: I71152995466a25e92b6d0b153538ebfc1b252f5b
2019-12-05 12:09:38 -08:00
Treehugger Robot d97822a5f7 Merge "Remove passing -forceprocessing flag to R8" 2019-12-05 08:56:38 +00:00
Jooyung Han 79961687db Merge "Move extra VNDKs to /system_ext" 2019-12-05 08:55:31 +00:00
Calin Juravle abdea2183d Add art dexpreopt to boot.zip archive
Test: m out/target/product/generic_arm64/boot.zip
Bug: 144491400
Change-Id: Id5f14efbbdf539f9f61599f2fbbc1a302334bb9a
2019-12-04 16:50:17 -08:00
Yifan Hong 88adfc6349 Mark BOARD_HAL_STATIC_LIBRARIES as obsolete.
No device in our tree use this obsolete thing now.
OEM devices with libhealthd should define health HAL
2.1 instead.

Test: builds
Fixes: 127677771
Change-Id: I1861452a3f7fc97ee20615c8f9f25422f9f507e2
2019-12-04 14:50:59 -08:00
David Anderson c55b2f516c Merge "build_image: Do not use base_fs file for system_other." 2019-12-04 21:28:53 +00:00
David Anderson 3269f25476 build_image: Do not use base_fs file for system_other.
system_other is not OTA'd (outside of factory OTA), and its block map differs greatly from
system.img, so do not attempt to re-use it.

Bug: 139201772
Test: make with base_fs file for system
Change-Id: I1ed2091da381ebdb93522a081e5d2f7c18c9d069
2019-12-04 21:28:42 +00:00
Treehugger Robot bbf17e92e5 Merge "Fix syntax error for SignApexFile" 2019-12-04 21:03:02 +00:00
Baligh Uddin ac936fd573 Fix syntax error for SignApexFile
BUG: 145662097
TEST: Local smoke test which invokes sign_apex for local apex files.
2019-12-04 08:30:32 -08:00
Treehugger Robot e16258ff5d Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:15:06 +00:00
Treehugger Robot c4fbb3a42d Merge "Add rust_device_test_config_template.xml" 2019-12-03 21:19:12 +00:00
Ulyana Trafimovich a5479b71e0 Merge "Add boot image locations to the module dexpreopt config." 2019-12-03 14:04:18 +00:00
Anton Hansson 5685159a7c Merge "Add sdkext module" 2019-12-03 13:47:39 +00:00
Anton Hansson c982aecdb1 Add sdkext module
Add the module to the build, and its jar to the bootclasspath.

Bug: 137191822
Test: m
Change-Id: I11700ac6da3fe031692b792d2975c5eec5414e09
2019-12-03 13:32:15 +00:00
Ulya Trafimovich 3ad6f5ebbf Add boot image locations to the module dexpreopt config.
Multiple boot image locations should be passed to dex2oat after
splitting the boot image into primary ART image and the framework
boot image extension.

Test: m

Bug: b/119800099

Change-Id: Ide6dfed1d09a6c12aad6f1cc0d4af4fb2c63a6be
2019-12-03 10:27:26 +00:00
Xin Li 3fc4383f38 Merge Android10 QPR1 into AOSP master
Bug: 145570283
Change-Id: Ic9069d28533b22c5b820203c65fc1e404a47755f
2019-12-02 21:25:01 -08:00
Roshan Pius 41e679308d Merge "base_system.mk: Align formatting for updatable boot jar variable"
am: 78560b2049

Change-Id: I677772fbf43148932f1a0af457f3060727594a06
2019-12-02 16:47:47 -08:00
Bill Peckham 0a17dc31f3 Merge "Don't generate recovery patch for A/B systems."
am: 43e5420a50

Change-Id: Iabcccc6dbf0f511150762df526facc0cf7ba1e1a
2019-12-02 16:45:58 -08:00
Roshan Pius 78560b2049 Merge "base_system.mk: Align formatting for updatable boot jar variable" 2019-12-03 00:43:17 +00:00