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
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
Treehugger Robot
1b9fd38513
Merge "Create telephony apex."
2019-12-09 18:52:05 +00:00
Jeff Sharkey
139a0c6e3d
Merge "Structure MediaProvider as an APEX."
2019-12-08 21:20:33 +00:00
Mitchell Wills
995821a6ab
Merge "Fix comment to reflect that the value passed to head is actually the size" am: 04175fa5fc
am: 91a3c6f217
...
am: 1483988117
Change-Id: I7059c4d0e5c2af008d3a7083b19b297829e83609
2019-12-07 00:31:33 -08: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
03e8a49f71
Merge "Use bash instead of sh in self extracting archive" am: 0c4f577f1c
am: 0ef7856a56
...
am: f8a39f32d7
Change-Id: Icc87a099a2b095c437ee17c054ecfd58c2cce0a0
2019-12-06 20:10:31 -08: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
b964a262e5
Merge "logtags: Support # line comments." am: cfd25567e6
am: 95370d66be
...
am: d6067c1886
Change-Id: Iceb7ebf97ec183a18afd7e351a2e73061e5bc703
2019-12-06 15:22:19 -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
Tobias Thierer
95370d66be
Merge "logtags: Support # line comments."
...
am: cfd25567e6
Change-Id: Iba4f020dffc58d2d928b4b435705140a0517f2ea
2019-12-06 15:16:46 -08:00
Treehugger Robot
cfd25567e6
Merge "logtags: Support # line comments."
2019-12-06 23:10:08 +00:00
Dan Willemsen
4db9d23381
Merge "Improve checks for include dirs outside the source tree" am: 9e0b4ed82a
am: ef5fe838f8
...
am: 033132eff6
Change-Id: Ib9c94e08cc95395738449c0a68d1e13dd6ca66f8
2019-12-06 14:02:06 -08:00
Dan Willemsen
033132eff6
Merge "Improve checks for include dirs outside the source tree" am: 9e0b4ed82a
...
am: ef5fe838f8
Change-Id: Idc34cf2d7ff58fbd5979edb512b365f49f02f910
2019-12-06 13:56:22 -08:00
Dan Willemsen
ef5fe838f8
Merge "Improve checks for include dirs outside the source tree"
...
am: 9e0b4ed82a
Change-Id: I4141a42e7cba1ed0e9981831f3b02fbd235f4fb1
2019-12-06 13:54:52 -08:00
Treehugger Robot
9e0b4ed82a
Merge "Improve checks for include dirs outside the source tree"
2019-12-06 21:49:25 +00:00
Ian Kasprzak
737c02b59a
Merge "Include all system images in -with-license.sh" am: c99726bcf0
am: 9633038e48
...
am: b836080120
Change-Id: I2e8fd98e17cfa6fb6a55bb445197685982486fad
2019-12-06 09:31:05 -08:00
Ian Kasprzak
b836080120
Merge "Include all system images in -with-license.sh" am: c99726bcf0
...
am: 9633038e48
Change-Id: I9dc5634b91cf2a018846d4cc7c1e8d0c439641f8
2019-12-06 09:25:03 -08:00
Ian Kasprzak
9633038e48
Merge "Include all system images in -with-license.sh"
...
am: c99726bcf0
Change-Id: I307b681394ccd288ef03b35ef0c6b6a66efd4525
2019-12-06 09:19:01 -08:00