Commit graph

58332 commits

Author SHA1 Message Date
TreeHugger Robot
7fdf27e437 Merge "Move service-statsd to updatable system server jar" 2019-12-13 19:48:39 +00:00
Automerger Merge Worker
fcabec6ec3 Merge "Add AFTL relevant options to OPTIONS in common.py." am: 9088392b6b am: f70dac0fc9 am: ab87bb98f9
Change-Id: I833d0e977d4e95eb9924e090af74437ab22cc5aa
2019-12-13 06:44:10 +00:00
Automerger Merge Worker
3fd96b0078 Merge "Add mainline_system_x86_64 product" am: 078b1598ff am: c47de5cb83 am: 8afcfa3877
Change-Id: I4edfa098ba8ed707e04bab5d93e6b0fed8217a43
2019-12-13 06:43:17 +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
2dd3133345 Merge "Adding developer_gsi_keys.mk" am: dad976ffcb am: c58307824a am: 6686dfe7d9
Change-Id: I9fa93c25a636e60304deeb9284fa4e908cd41adb
2019-12-13 03:59:54 +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
b525412cc2 Merge "Add linkerconfig to recovery" am: 0542582560 am: 3701950613 am: b960782c52
Change-Id: I73bbd7ae770d51a75d3c63ed5877d00c4ad3c795
2019-12-13 02:38:23 +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
Tej Singh
e9403e4e79 Move service-statsd to updatable system server jar
This moves StatsCompanionService into the statsd apex.
service-statsd.jar is no longer installed to system/framework, and is
instead installed to
/apex/com.android.os.statsd/javalib/service-statsd.jar by moving it from
PRODUCT_SYSTEM_SERVER_JARS to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS

Bug: 145923413
Test: make clean; make; vendor/google/tools/flashall and manual
inspection of jar locations
Test: made trivial update to SCS and bumped the version of the apex.
Then did: 1. make com.android.os.statsd 2. adb install
com.android.os.statsd 3. adb reboot. Verified that the change was
reflected via the apex update

Change-Id: Ia261ea79b2a46a4cc709e1b7dd072de15e17571e
2019-12-12 15:23:59 -08:00
Nicholas Ambur
76211be490 Merge "Add SoundTrigger@2.3 to gsi" 2019-12-12 21:37:00 +00:00
Howard Ro
e70ae57611 Merge "Add statsd apex to base_system" 2019-12-12 14:17:41 +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
Nicholas Ambur
7df7b8601b Add SoundTrigger@2.3 to gsi
Bug: 141929369
Test: build and verify that build includes soundtrigger@2.3
Change-Id: Ie0070feff43931d3f702d5a7732c78fa4623d3d2
2019-12-11 19:15:01 -08:00
Automerger Merge Worker
04fec1de24 Merge "releasetools: Generalize base_fs_file handling." am: 066fac7c8c am: 0f4e7f82bc am: f6f2939503
Change-Id: I1cf27310e91b1c2967ce006b814d9650d0065f6a
2019-12-11 23:36:55 +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
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
Automerger Merge Worker
8204ab1397 [automerger skipped] Merge "Change all cf_common paths to cuttlefish paths" am: 3b500a7ec3 am: 85f60f8307 am: ec95588134 -s ours
am skip reason: Change-Id I9911ba93e642ac1909be45334a5f45fc95a4ab48 with SHA-1 7a597f572b is in history

Change-Id: I15189b6c79d8d2b15bb51b5d25e0ef9e38deedc2
2019-12-11 04:38:23 +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
Howard Ro
756ba7dc52 Add statsd apex to base_system
Bug: 145960929
Test: atest statsd_e2e_tests --rebuild-module-info
Change-Id: I83476ea471abbf5803a1edc3cb717ee450e6e152
2019-12-10 19:06:45 -08:00
Ram Muthiah
36ade67c50 Merge "Change all cf_common paths to cuttlefish paths" 2019-12-11 02:41:45 +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
Ram Muthiah
7a597f572b Change all cf_common paths to cuttlefish paths
Merging cuttlefish_common master into cuttlefish master

Bug: 143774116
Test: Treehugger
Change-Id: I9911ba93e642ac1909be45334a5f45fc95a4ab48
Exempt-From-Owner-Approval: cf-only change
2019-12-10 21:24:38 +00:00
Automerger Merge Worker
2f69bc4605 Merge "Add telephony-common, ims-common to telephony apex." am: 52df8f5154 am: 5d2a05f5a1 am: b5144d4c59
Change-Id: Iadb4874a5a812fb214506325d797354ad99818af
2019-12-10 19:10:43 +00:00
Ahmed ElArabawy
d6e05fe1d0 Merge "VDK: add android.hardware.wifi.hostapd@1.2.so" 2019-12-10 19:01:41 +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
Aurimas Liutikas
e7bed1b505 Merge "Move to using full java-lib-files from stubs." am: ac3bf4e3a9 am: 09171641a3
am: d68d821009

Change-Id: Iea3b9411febc6233e02e02147c9b886b7798ac1e
2019-12-09 20:59:56 -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
Amit Mahajan
eebe2d7cab Merge "Create telephony apex." am: 1b9fd38513 am: c1ddc3adbc
am: 69a527d108

Change-Id: I5c28225d61996cb719ae384d7b0828776e84f8d5
2019-12-09 11:03:09 -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