Lajos Molnar
0fb6fcca27
allow actually 140MB vendor partition space
...
Bug: 129710438
Change-Id: I93bfe7f25f16a8e48871db7357ec587c21dcc7d6
2019-04-04 21:59:30 +00:00
Yifan Hong
8b7fe36968
supernod: make intermediates directory.
...
Bug: 120041578
Test: delete the directory, then `m supernod`
Change-Id: If2f153fc8815b1bbf77774849be9cc2cdb5fd913
Merged-In: If2f153fc8815b1bbf77774849be9cc2cdb5fd913
2019-04-04 13:30:23 -07:00
Johan Harvyl
ca1dbcc809
Remove 'column' from modules target
...
The standard target modules stopped working when restrictions in
soong were introduced to which binaries are allowed to be used during
builds.
Listing a very large amount of modules in columns does not make it
more readable and harder to work with in tools so just drop it.
Bug: 129800175
Test: make modules
(cherry picked from commit 7005d4f4cc
)
Change-Id: I317f6eb4ba5ea633264939a9a58f716bdb36596e
2019-04-04 13:19:51 -07:00
Lajos Molnar
0c8d2b748c
media: remove soft OMX components from VNDK
...
Bug: 129710438
Change-Id: I23b2ab67d05895f4c9085b8ac878dcf45200e18f
2019-04-04 19:09:20 +00:00
Lajos Molnar
9d2acacd52
media: move com.android.media.swcodecs to base_system.mk.
...
This can now be supported on all devices.
Bug: 129710438
Change-Id: Ide0921361ce6b22655f6f5a2695fc892dbe47998
(cherry picked from commit 4609a369d4
)
2019-04-04 19:06:40 +00:00
Anton Hansson
9ca0c27be6
Move device-specific vars from mainline common
...
Move a couple of variables out of BoardConfigMainlineCommon
because they vary either by device or by how they build in
AOSP vs internal.
Bug: 80410283
Test: presubmit
Change-Id: Ia42df91ad8c8d8fc4618be375a17ea23896f4352
Merged-In: Ia42df91ad8c8d8fc4618be375a17ea23896f4352
2019-04-04 18:47:48 +01:00
Ian Pedowitz
0772f2a498
Android Q is Android 10
...
Bug: 129683166
Bug: 129943426
Test: source build/envsetup.sh && lunch blueline-userdebug && m -j cts
docs tests
Test: Flashed build to blueline, ensured it booted
Test: Verified "10" under Settings -> About phone -> Android version
Change-Id: Idec1479d93876bc57711c31e70f34008a05881d1
2019-04-04 09:12:21 -07:00
Bill Rassieur
50d01d6aa3
Merge master@5406228 into git_qt-dev-plus-aosp.
...
am: 99ae566b45
Change-Id: I426fabaae86fdf02f31021709e3e791b70e80ab3
2019-04-03 16:11:35 -07:00
TreeHugger Robot
ec5b7c5646
Merge "Remove Arvo/Lato/ArbutusSlab/Rubik fonts from all product targets."
2019-04-03 22:14:49 +00:00
Amin Shaikh
288ec50c08
Remove Arvo/Lato/ArbutusSlab/Rubik fonts from all product targets.
...
For OEMs that would like to include these fonts, feel free to include
them in product targets outside of this project.
Bug: 123701811
Test: make
Change-Id: I641477e24155e3e1c0a97f484a500aa155b1a9c4
2019-04-03 21:45:44 +00:00
Yifan Hong
0c7befddcf
[automerger skipped] Merge "Add libcgrouprc.so to LL-NDK" am: 058ddaea8d
am: 16c29ebe32
...
am: 45fe4f22a4
-s ours
am skip reason: change_id I8228580879c6eb3d44a9111a6ed09b328df4a2c8 with SHA1 d89aacf6d5
is in history
Change-Id: I98ae69983a7223f5289589ab1e29116552969f6f
2019-04-03 13:40:19 -07:00
Yifan Hong
45fe4f22a4
Merge "Add libcgrouprc.so to LL-NDK" am: 058ddaea8d
...
am: 16c29ebe32
Change-Id: If5a128df06795dddfa83f623b5ffa5520a5cd7e4
2019-04-03 12:43:30 -07:00
Yifan Hong
16c29ebe32
Merge "Add libcgrouprc.so to LL-NDK"
...
am: 058ddaea8d
Change-Id: I603b6e69116c676a068b8230c56742bdf1ea4306
2019-04-03 12:18:05 -07:00
Yifan Hong
058ddaea8d
Merge "Add libcgrouprc.so to LL-NDK"
2019-04-03 19:08:51 +00:00
Yifan Hong
02799d98a3
Merge "Add libcgrouprc.so to LL-NDK"
2019-04-03 16:41:21 +00:00
joker.yang
40301d8f1d
Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility" am: 78ec599720
am: 0e2559c2d6
...
am: 680a116cba
Change-Id: I04cf92309e489b4304ca4f62c6ebce51489e5b9f
2019-04-03 09:40:15 -07:00
joker.yang
680a116cba
Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility" am: 78ec599720
...
am: 0e2559c2d6
Change-Id: I4e1f9781f903b4d3ef55b30b087c89126bc09db6
2019-04-03 09:24:30 -07:00
joker.yang
0e2559c2d6
Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility"
...
am: 78ec599720
Change-Id: I7c6759b45b8e7af3df7cf31288a9d484098704cf
2019-04-03 09:07:49 -07:00
Treehugger Robot
78ec599720
Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility"
2019-04-03 15:27:21 +00:00
Anton Hansson
d235946a3d
Merge "Add more product defaults to mainline.mk" am: 7369b7622f
am: b35434d9bf
...
am: ce2754f57c
Change-Id: I2c12bd0b250f45a4b3e538c2a6ea081f6d2acdad
2019-04-03 02:33:26 -07:00
Anton Hansson
ce2754f57c
Merge "Add more product defaults to mainline.mk" am: 7369b7622f
...
am: b35434d9bf
Change-Id: Id1bf855ed130145740ea3f08acc6b95004611ef7
2019-04-03 02:18:12 -07:00
Anton Hansson
b35434d9bf
Merge "Add more product defaults to mainline.mk"
...
am: 7369b7622f
Change-Id: Ibc396c121626cc6a6c2af269d6eba2b9d8bb5cd2
2019-04-03 02:05:58 -07:00
Nicolas Geoffray
add5c3b658
Merge "Re-order the ext/framework boot jars in bootclasspath." am: 31a7dee48b
am: 2c142f1178
...
am: 719b51b400
Change-Id: I68d9fa0af7681b34989725b15a1f36d01ed58364
2019-04-03 01:37:41 -07:00
Anton Hansson
7369b7622f
Merge "Add more product defaults to mainline.mk"
2019-04-03 08:28:06 +00:00
Nicolas Geoffray
719b51b400
Merge "Re-order the ext/framework boot jars in bootclasspath." am: 31a7dee48b
...
am: 2c142f1178
Change-Id: Ic16d4172f0fe53059898a12a43311f7070f85a8c
2019-04-03 01:15:27 -07:00
Nicolas Geoffray
2c142f1178
Merge "Re-order the ext/framework boot jars in bootclasspath."
...
am: 31a7dee48b
Change-Id: I5569cb4ca2c221497da80d7d8f485fe0b94137c8
2019-04-03 01:06:19 -07:00
Nicolas Geoffray
31a7dee48b
Merge "Re-order the ext/framework boot jars in bootclasspath."
2019-04-03 07:27:55 +00:00
Yifan Hong
4ceadcda40
Add libcgrouprc.so to LL-NDK
...
Bug: 123664216
Test: builds
Change-Id: I8228580879c6eb3d44a9111a6ed09b328df4a2c8
Merged-In: I8228580879c6eb3d44a9111a6ed09b328df4a2c8
2019-04-02 22:32:34 -07:00
Dan Willemsen
4f447f1415
Merge "Remove a few entries from PRODUCT_HOST_PACKAGES" am: 9e4e30e219
am: 7954503ea1
...
am: d800adb979
Change-Id: I7bf1a4f4c0b2e53bf19fb53238f0fb641eec36a3
2019-04-02 20:34:24 -07:00
Dan Willemsen
d800adb979
Merge "Remove a few entries from PRODUCT_HOST_PACKAGES" am: 9e4e30e219
...
am: 7954503ea1
Change-Id: Idc2de0a5dbc9ba95e36a0b5514ec944e2d6fe1e3
2019-04-02 19:34:39 -07:00
Dan Willemsen
7954503ea1
Merge "Remove a few entries from PRODUCT_HOST_PACKAGES"
...
am: 9e4e30e219
Change-Id: I6cba6da5f7269d3a9067df6b9c5462468db0d78e
2019-04-02 19:24:45 -07:00
Treehugger Robot
9e4e30e219
Merge "Remove a few entries from PRODUCT_HOST_PACKAGES"
2019-04-03 02:01:56 +00:00
joker.yang
a75c9a5079
Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility
...
We have developed a vendor module and set LOCAL_VENDOR_MODULE := true<space> (Added a space character at the end)
The android build system then can't installed it in the right partition until we removed the extra space character.
bug: 129725067
Change-Id: I081ffe7f39a9c850007ba304c815436500be694c
2019-04-03 01:31:43 +00:00
Dan Willemsen
a15c3a838d
Remove a few entries from PRODUCT_HOST_PACKAGES
...
adbd shouldn't be needed on the host in most cases
selinux_policy_system is a device PHONY_PACKAGE that will stop working
soon in PRODUCT_HOST_PACKAGES. I talked to jeffv and he's fine removing
it for now, adding back individual binaries if desired, or creating a
new host PHONY_PACKAGE.
shell_and_utilities_system is a similar device phony module. enh is fine
with it not being installed on the host by default for now, and we can
add them back as needed.
Test: treehugger
Change-Id: I1938f9f4ea5dbea2905baaf301473b617de9c530
2019-04-02 16:03:28 -07:00
Tao Bao
4117d7df6f
Merge "releasetools: Update the embedded AVB pubkey in an APEX." am: 289fa3cea3
am: a24aecb821
...
am: 013c86f4fc
Change-Id: I137507e29b5f734e3657664ee900e11da672db95
2019-04-02 11:06:39 -07:00
Nicolas Geoffray
bfe65c6a1b
Re-order the ext/framework boot jars in bootclasspath.
...
Order of those doesn't matter, and the new order simplifies b/119800099.
Test: m and boots
Bug: 119800099
Change-Id: I9667a8d49ae751dfe713e37483548a58dfb25bd4
2019-04-02 17:56:07 +00:00
Tao Bao
013c86f4fc
Merge "releasetools: Update the embedded AVB pubkey in an APEX." am: 289fa3cea3
...
am: a24aecb821
Change-Id: If6749934a8326829d594f5f5003b15a48172a7e5
2019-04-02 10:34:12 -07:00
Colin Cross
b4fd03b3fc
[automerger skipped] Merge "Remove media_cmd from product packages" am: 00d8c4b64e
am: fef973ecc4
...
am: 23a8ddda67
-s ours
am skip reason: change_id I15ef7cb373ff249887f5641ca9c9722bfc3263a2 with SHA1 a13f3750f4
is in history
Change-Id: Iedd21af02587adfdd4b73466d30fe2e51bc36b62
2019-04-02 10:30:57 -07:00
Tao Bao
a24aecb821
Merge "releasetools: Update the embedded AVB pubkey in an APEX."
...
am: 289fa3cea3
Change-Id: Iaf4497f41f38fff7bf646f923f61b7a8199e5cfc
2019-04-02 10:22:53 -07:00
Colin Cross
23a8ddda67
Merge "Remove media_cmd from product packages" am: 00d8c4b64e
...
am: fef973ecc4
Change-Id: Iba91a542a6eea0496c4c204ee6a52bc0b8f53f28
2019-04-02 10:13:10 -07:00
Tao Bao
289fa3cea3
Merge "releasetools: Update the embedded AVB pubkey in an APEX."
2019-04-02 16:56:45 +00:00
Colin Cross
fef973ecc4
Merge "Remove media_cmd from product packages"
...
am: 00d8c4b64e
Change-Id: Ie90fa9f2c42dd4a577d26794dbe1bb3994a260ee
2019-04-02 09:54:16 -07:00
Colin Cross
00d8c4b64e
Merge "Remove media_cmd from product packages"
2019-04-02 16:39:04 +00:00
Bill Peckham
f4f3007461
Merge "Add support merging system and other for the non-A/B configuration." am: 5f4186b000
am: a635376ce1
...
am: ec4b69a7d6
Change-Id: I3785bd7da43f028e61110bd3780930f5098c1c5a
2019-04-02 06:35:21 -07:00
Bill Peckham
ec4b69a7d6
Merge "Add support merging system and other for the non-A/B configuration." am: 5f4186b000
...
am: a635376ce1
Change-Id: Ibdc6ec6facf44479f8ef0516988f9fc2fa1c7a53
2019-04-02 06:28:56 -07:00
Bill Peckham
a635376ce1
Merge "Add support merging system and other for the non-A/B configuration."
...
am: 5f4186b000
Change-Id: I347d05f8a60c5f63ba591aed8d16b078bfdfb840
2019-04-02 06:24:25 -07:00
Bill Peckham
5f4186b000
Merge "Add support merging system and other for the non-A/B configuration."
2019-04-02 13:15:17 +00:00
Tao Bao
9c0f443264
releasetools: Update the embedded AVB pubkey in an APEX.
...
APEX keys are now embedded in the APEX [1].
[1] https://android-review.googlesource.com/c/platform/system/apex/+/936942
Fixes: 128297564
Test: Run sign_target_files_apks.py on a target_files.zip built with the
CL above.
Change-Id: I219cc3e6ce6f652537fcc37322c8902f295c1447
2019-04-01 21:30:07 -07:00
Bill Peckham
364c1ccaa5
Add support merging system and other for the non-A/B configuration.
...
For non-A/B, you must supply the --system-item-list, --other-item-list, and
--system-misc-info-keys parameters approrpriate for merging two partial target
files. Additionally, you must supply the --rebuild-recovery option to correctly
generate the filesystem config and file contexts. With all of these parameters,
the script will generate a merged target files containing the correct recovery
files.
Also fix the --keep-tmp option to be consistent with the other options.
Bug: 122813742
Test: verify that merged target image boots and can perform OTA.
Change-Id: I5a942ac0cd9924fec419a686794a2340304594c8
2019-04-01 14:55:33 -07:00
Martin Stjernholm
ff2f484864
Merge "Drop libsigchain from the system image." am: c712ac1001
am: 683996193e
...
am: 11eb0df260
Change-Id: I0af560e8e50f2cbd8c6435967092f46eb4082635
2019-04-01 12:37:25 -07:00