SzuWei Lin
cbd421fd0e
Remove unnecessary items in treble_common.mk
...
Bug: 62360563
Test: Build and check files are still exist in system image
Change-Id: Ie787969d072c5b89d377a2c0b01706764185d6a5
2017-06-19 17:58:30 +08:00
Nicolas Geoffray
8be30c47d7
Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev
...
am: 0081d76597
Change-Id: I81039c2b5d1ae202e4cbca43e98322e15ab5c3e9
2017-06-15 14:42:18 +00:00
Nicolas Geoffray
0081d76597
Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev
2017-06-15 14:06:10 +00:00
Nicolas Geoffray
c3ffeddc59
Add a new PRODUCT variable for forcing 'speed' preopt.
...
bug: 35872915
Test: build
(cherry picked from commit 4a0ad4ac61
)
Change-Id: Idfea3c379a2b1dab30ee94a58ffe86d508f8522f
2017-06-15 12:40:15 +01:00
SzuWei Lin
4a421a28d0
Merge "Add more libs into generic AOSP system image" into oc-dev
...
am: 57fb2214ab
Change-Id: I011b16eb3c7ee21a52a04586d8249254e8d53dc8
2017-06-14 09:10:04 +00:00
TreeHugger Robot
57fb2214ab
Merge "Add more libs into generic AOSP system image" into oc-dev
2017-06-14 09:06:45 +00:00
Isaac Chen
71891cdb3e
Merge "Fix audio policy configuration for generic targets" into oc-dev
...
am: 34d8c95fd7
Change-Id: I16ab64f6955031bfced51e8049f96f95033624ef
2017-06-14 08:22:36 +00:00
TreeHugger Robot
34d8c95fd7
Merge "Fix audio policy configuration for generic targets" into oc-dev
2017-06-14 08:17:10 +00:00
SzuWei Lin
56d68a5192
Add more libs into generic AOSP system image
...
Includes:
- more HIDL interfaces
- explicitly specify all LL-NDK and SP-NDK (currently only
libandroid_net is missing)
- add liblzma and libyuv
Bug: 38339299
Test: build aosp_arm64_ab and pass
Change-Id: Ic67d47990cf6b4ab51e1b74f0fed85e60ce3a817
2017-06-14 14:57:15 +08:00
TreeHugger Robot
7f0e79b146
Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev
2017-06-14 04:13:42 +00:00
Hung-ying Tyan
35405d22e5
Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev
...
am: d9657ef5be
-s ours
Change-Id: I91597e28529560d19525a4302fbf69206ebde9c4
2017-06-14 02:29:36 +00:00
Bowgo Tsai
53cf999923
Align size of vbmeta image to 4k boundary
...
Adding option "--padding_size 4096" when making vbmeta.img.
Bug: 38454093
Test: build vbmeta.img and check it's being padded.
Change-Id: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
Merged-In: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
(cherry picked from commit 7cd30041e9
)
2017-06-14 10:14:24 +08:00
Hung-ying Tyan
d9657ef5be
Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev
2017-06-14 02:13:51 +00:00
SzuWei Lin
34b018804d
Merge "Normalize building generic system image with treble-common.mk" into oc-dr1-dev
2017-06-14 01:39:55 +00:00
Dolly Dhariwal
9626f4c8a0
Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev
...
am: 6652dd9005
-s ours
Change-Id: Ia25dbed43ba1614276c57756d2c1858614648635
2017-06-13 19:52:44 +00:00
TreeHugger Robot
6652dd9005
Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev
2017-06-13 19:43:02 +00:00
Jeff Vander Stoep
716b768594
Build split file_contexts for recovery
...
am: 4ff042c4aa
Change-Id: I9eff1afef9e427c2e97a64b663a029ef33a8ac4a
2017-06-13 18:00:03 +00:00
Jeff Vander Stoep
4ff042c4aa
Build split file_contexts for recovery
...
Bug: 62564629
Test: build and flash marlin. Successfully switch between regular
and recovery modes
Change-Id: I67ae2f59ca1868cfe777de0d4f0c4e3c2d99329d
2017-06-13 15:39:29 +00:00
Dolly Dhariwal
3e7387a34e
Updating the BUILD_ID to OC-DR1 for oc-dr1-dev branch.
...
Bug: None
Test: Build and flashed AIO device
Change-Id: I53047dbc0b89c2b3afe5d2af3c0532968f60b893
Merged-In: I796d7490f39f817af8f2ec5bea86593182bfcbe2
2017-06-13 15:14:45 +00:00
Hung-ying Tyan
a6b68e72b1
Revert "Revert "Move /default.prop to /system/etc/prop.default""
...
This reverts commit 88c9dddd0f
.
Bug: 37815285
Bug: 62525809
Test: Tested with ag/2400523 and ag/2400524. Booted pixel phones,
checked the location of prop.default, verified the symlink,
checked a few properties via adb shell and manually tested
a few apps (Camera, Maps etc).
sign_target_files_apks.py was tested with:
sign_target_files_apks -o -e DynamiteLoader.apk= -e DynamiteModulesA.apk= \
-e DynamiteModulesB.apk= -e DynamiteModulesC.apk= -e DynamiteModulesD.apk= \
-e GoogleCertificates.apk= out/dist/*-target_files-*.zip signed-target_files.zip
Booted to recovery and ran 'adb sideload' successfully.
Change-Id: I2ddf287f42360d1a7c7a22f08e7b9e203e7e603a
2017-06-13 21:18:04 +08:00
Dolly Dhariwal
14a9d76026
Updating the BUILD_ID to OC for oc-dev branch.
...
Bug: None
Test: Build and flashed AIO device
Change-Id: I0c87c33b8fb6cbaf71cdb90ce86097bfb31f4137
Merged-In: I53047dbc0b89c2b3afe5d2af3c0532968f60b893
2017-06-13 06:24:35 +00:00
SzuWei Lin
6fdff23df2
Normalize building generic system image with treble-common.mk
...
Move the common part from make file of generic AOSP system images into
treble_common.mk, and update the content of common part.
The common part inclueds:
- HAL interfaces
- VNDK libs
- VNDK-SP libs
- Some other modules supporting HAL interfaces
- Some Treble default configurations
Bug: 37927875
Test: boot to home screen with the generic system image
Merged-In: I4202454d57970cef713f7d6437191094df0009e9
Change-Id: I4202454d57970cef713f7d6437191094df0009e9
2017-06-13 03:15:39 +00:00
Tao Bao
46e6c931e4
Merge "Revert "Move /default.prop to /system/etc/prop.default"" into oc-dev
...
am: d4b25e481e
-s ours
Change-Id: I1e5e8ec5b347cc5cb3940a99873ef476e521cd30
2017-06-12 19:57:14 +00:00
Tao Bao
d4b25e481e
Merge "Revert "Move /default.prop to /system/etc/prop.default"" into oc-dev
2017-06-12 19:39:54 +00:00
Tao Bao
88c9dddd0f
Revert "Move /default.prop to /system/etc/prop.default"
...
This reverts commit fad00e4318
.
init fails to read default.prop under recovery:
init: Couldn't load properties from /default.prop: Too many symbolic links encountered
Bug: 62525809
Change-Id: I133e9025693e3e01278ec73c8d08860fc89d314b
2017-06-12 17:00:42 +00:00
Isaac Chen
924e705c85
Fix audio policy configuration for generic targets
...
Changes in this CL:
1. Use ":=", instead of "+=", for PRODUCT_COPY_FILES so previous audio
policy related settings won't be overwritten.
2. Use basic audio policy XML files provided by audio team as default.
Bug: 62524944
Test: check if the XML files for audio policy configuration are under
/system/etc and devices with generic system imagei, but without
such configuration under /vendor/etc can boot with audio working.
Change-Id: I4ccffdfb131a9d2445d9c2f52a22ffcc97884479
2017-06-12 18:56:50 +08:00
Adam Seaton
d2d14aa0ea
Updating security string to 2017-08-05
...
am: d6e984f9e3
Change-Id: I99f6d08450167c1b3d91e89818f07f2c0e0e2a24
2017-06-09 20:14:29 +00:00
Adam Seaton
d6e984f9e3
Updating security string to 2017-08-05
2017-06-09 10:50:47 -07:00
Hung-ying Tyan
fb4c882f29
Merge "Move /default.prop to /system/etc/prop.default" into oc-dev
...
am: fc00134c1e
-s ours
Change-Id: Id8ef4c35c142069052801c783bcba623681fbdb1
2017-06-09 08:12:27 +00:00
Hung-ying Tyan
fc00134c1e
Merge "Move /default.prop to /system/etc/prop.default" into oc-dev
2017-06-09 08:04:37 +00:00
Hung-ying Tyan
fad00e4318
Move /default.prop to /system/etc/prop.default
...
This patch tries to fix the problem where the default properties need
to go with the system image especially on non-AB devices where
/default.prop is on the ramdisk image. A symlink is created at
/default.prop for backward compatibility.
Bug: 37815285
Test: Tested with ag/2376383. Booted pixel phones, checked the location
of prop.default, verified the symlink, checked a few properties
(via adb shell getprop) and manually tested a few apps (Camera,
Maps etc).
sign_target_files_apks.py was tested with:
sign_target_files_apks -o -e DynamiteLoader.apk= -e DynamiteModulesA.apk= \
-e DynamiteModulesB.apk= -e DynamiteModulesC.apk= -e DynamiteModulesD.apk= \
-e GoogleCertificates.apk= out/dist/*-target_files-*.zip signed-target_files.zip
Change-Id: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
2017-06-09 13:00:58 +08:00
TreeHugger Robot
faa7a4a716
Merge "Use different versions for framework compatibility matrix" into oc-dr1-dev
2017-06-09 00:46:21 +00:00
Adam Seaton
8e9fca1a47
[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753bc4
am: 8828ffc63e
am: edda32c5e3
-s ours am: af114e0286
-s ours am: 332ef64b0e
-s ours am: c56a72d5fc
-s ours am: e4f93ecc22
-s ours
...
am: c41c875e40
Change-Id: I35926532d46af4429fd2795105bf2b906ee38b06
2017-06-08 22:32:30 +00:00
Adam Seaton
f62f9bc10f
[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b23c
am: c486b5d047
am: 92c1ca1f5c
-s ours am: 5cada70115
-s ours am: 525c88d2c8
-s ours am: d9109cc1c6
-s ours am: a66e843ded
-s ours
...
am: e2f98a3f49
Change-Id: I52bf3206a7e7e54007f620afcf0ae9c291b94fd4
2017-06-08 22:32:22 +00:00
Adam Seaton
c41c875e40
[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753bc4
am: 8828ffc63e
am: edda32c5e3
-s ours am: af114e0286
-s ours am: 332ef64b0e
-s ours am: c56a72d5fc
-s ours
...
am: e4f93ecc22
-s ours
Change-Id: Icb54a96f3bc41251d70acf42464a4232be200c47
2017-06-08 22:30:37 +00:00
Adam Seaton
e2f98a3f49
[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b23c
am: c486b5d047
am: 92c1ca1f5c
-s ours am: 5cada70115
-s ours am: 525c88d2c8
-s ours am: d9109cc1c6
-s ours
...
am: a66e843ded
-s ours
Change-Id: I0646b133e890c4f42ffe20d1b9273a808c027873
2017-06-08 22:30:32 +00:00
TreeHugger Robot
393eee9462
Merge "Add mising AAPT2 dependency" into oc-dr1-dev
2017-06-08 22:30:25 +00:00
Adam Seaton
5ed626699b
[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753bc4
am: 8828ffc63e
am: edda32c5e3
am: 4f43543b11
am: 7801b3d4b6
-s ours
...
am: c012ed7db7
Change-Id: I569d2a484e1f321a1b3a8e32a772a3f798bed528
2017-06-08 22:28:33 +00:00
Adam Seaton
e4f93ecc22
[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753bc4
am: 8828ffc63e
am: edda32c5e3
-s ours am: af114e0286
-s ours am: 332ef64b0e
-s ours
...
am: c56a72d5fc
-s ours
Change-Id: I94cd4cfcded3eadbde4b0ca4e18c8dd907174c2f
2017-06-08 22:28:30 +00:00
Adam Seaton
30496345f4
[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b23c
am: c486b5d047
am: 92c1ca1f5c
am: 93b5d26067
am: dbaa8cfaee
-s ours
...
am: bdc526e833
Change-Id: Ice2f49dd3f7cd434c3591a72dc33addc45c4062b
2017-06-08 22:28:26 +00:00
Adam Seaton
a66e843ded
[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b23c
am: c486b5d047
am: 92c1ca1f5c
-s ours am: 5cada70115
-s ours am: 525c88d2c8
-s ours
...
am: d9109cc1c6
-s ours
Change-Id: Ifccd5223842b85ba689e9cf7d86e8c3f782d471a
2017-06-08 22:28:25 +00:00
Adam Seaton
c012ed7db7
[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753bc4
am: 8828ffc63e
am: edda32c5e3
am: 4f43543b11
...
am: 7801b3d4b6
-s ours
Change-Id: I66f1d69ea99409328136b4d9b77f284382ed1535
2017-06-08 22:26:24 +00:00
Adam Seaton
c56a72d5fc
[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753bc4
am: 8828ffc63e
am: edda32c5e3
-s ours am: af114e0286
-s ours
...
am: 332ef64b0e
-s ours
Change-Id: Icc1fb0c39bff8d6c03860c861e6560bf26e9ac37
2017-06-08 22:26:24 +00:00
Adam Seaton
bdc526e833
[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b23c
am: c486b5d047
am: 92c1ca1f5c
am: 93b5d26067
...
am: dbaa8cfaee
-s ours
Change-Id: Ib5b3c252d0ee6e9d12edee8e44fd1154fa62370e
2017-06-08 22:26:20 +00:00
Adam Seaton
d9109cc1c6
[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b23c
am: c486b5d047
am: 92c1ca1f5c
-s ours am: 5cada70115
-s ours
...
am: 525c88d2c8
-s ours
Change-Id: I76fa61270e0175db6ba51f78c07b231c943387f0
2017-06-08 22:26:20 +00:00
Adam Seaton
7801b3d4b6
[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753bc4
am: 8828ffc63e
am: edda32c5e3
...
am: 4f43543b11
Change-Id: I4efeaa885f6d5a7e7d09d69c4b6627be1fe71a52
2017-06-08 22:24:30 +00:00
Adam Seaton
332ef64b0e
[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753bc4
am: 8828ffc63e
am: edda32c5e3
-s ours
...
am: af114e0286
-s ours
Change-Id: Ie4d5456a8883b1f3e86af1204f0a627ddd0f9dbe
2017-06-08 22:24:27 +00:00
Adam Seaton
dbaa8cfaee
[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b23c
am: c486b5d047
am: 92c1ca1f5c
...
am: 93b5d26067
Change-Id: I04be3f2332d926a4b6d3dfb0bcfc921b76e8d9a1
2017-06-08 22:24:25 +00:00
Adam Seaton
525c88d2c8
[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b23c
am: c486b5d047
am: 92c1ca1f5c
-s ours
...
am: 5cada70115
-s ours
Change-Id: I2d03b9c0bb0820cea78f4a34ac30a2696c312210
2017-06-08 22:24:21 +00:00
Adam Seaton
4f43543b11
[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753bc4
am: 8828ffc63e
...
am: edda32c5e3
Change-Id: Iebc23556477b796e6329efb5adaa1804d5adcb33
2017-06-08 22:20:25 +00:00