Tao Bao
88c9dddd0f
Revert "Move /default.prop to /system/etc/prop.default"
...
This reverts commit fad00e4318
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
c5c1af423a
Updating security string to 2017-08-05
...
am: d6e984f9e3
2017-06-09 20:14:27 +00:00
Adam Seaton
d6e984f9e3
Updating security string to 2017-08-05
2017-06-09 10:50:47 -07:00
Paul Duffin
c45b7e3d98
Added android.test.mock to PRODUCT_PACKAGES
...
Adds android.test.mock.jar to the /system/framework
directory. That will allow it to be dynamically included
with a uses-library manifest entry.
Bug: 30188076
Test: flash and check contents of /system/framework
Change-Id: I3ea0e558276176edd21e24c8337980c5c02a652e
2017-06-09 13:34:13 +01:00
Hung-ying Tyan
3fb7217336
Merge "Move /default.prop to /system/etc/prop.default" into oc-dev
...
am: fc00134c1e
2017-06-09 08:12:10 +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
Tao Bao
ddb9391d6b
Merge "Delay the write-back of misc_info in sign_target_files_apks.py." am: d6e8002734
...
am: 6da0f9c8fd
2017-06-08 22:34:22 +00:00
Adam Seaton
35cb152c58
[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
2017-06-08 22:32:31 +00:00
Adam Seaton
9f58c6ab5c
[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
2017-06-08 22:32:23 +00:00
Tao Bao
6da0f9c8fd
Merge "Delay the write-back of misc_info in sign_target_files_apks.py."
...
am: d6e8002734
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
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
2017-06-08 22:30:32 +00:00
Adam Seaton
32535d9241
[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
2017-06-08 22:28:36 +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
2017-06-08 22:28:30 +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
2017-06-08 22:28:25 +00:00
Adam Seaton
d7e2b3bd06
[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
2017-06-08 22:28:23 +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
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
2017-06-08 22:26:24 +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
2017-06-08 22:26:20 +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
2017-06-08 22:26:20 +00:00
Treehugger Robot
d6e8002734
Merge "Delay the write-back of misc_info in sign_target_files_apks.py."
2017-06-08 22:24:53 +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
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
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
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
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
2017-06-08 22:20:25 +00:00
Adam Seaton
af114e0286
[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753bc4 am: 8828ffc63e
...
am: edda32c5e3
2017-06-08 22:20:23 +00:00
Adam Seaton
93b5d26067
[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b23c am: c486b5d047
...
am: 92c1ca1f5c
2017-06-08 22:20:20 +00:00
Adam Seaton
5cada70115
[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b23c am: c486b5d047
...
am: 92c1ca1f5c
2017-06-08 22:20:19 +00:00
Adam Seaton
edda32c5e3
[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753bc4
...
am: 8828ffc63e
2017-06-08 22:18:24 +00:00
Adam Seaton
92c1ca1f5c
[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b23c
...
am: c486b5d047
2017-06-08 22:18:20 +00:00
Adam Seaton
8828ffc63e
[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772
...
am: 2b93753bc4
2017-06-08 22:16:24 +00:00
Adam Seaton
c486b5d047
[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772
...
am: a847c0b23c
2017-06-08 22:16:20 +00:00
TreeHugger Robot
070b6d4df7
Merge "Unspecialize oc-dev-plus-aosp" into oc-dev-plus-aosp
2017-06-08 19:07:15 +00:00
Dan Willemsen
18ce90bce3
Merge "Add mising AAPT2 dependency" am: 25a4c9481b
...
am: ac47d13b2e
2017-06-08 16:18:24 +00:00
Dan Willemsen
ac47d13b2e
Merge "Add mising AAPT2 dependency"
...
am: 25a4c9481b
2017-06-08 16:15:24 +00:00
Dan Willemsen
25a4c9481b
Merge "Add mising AAPT2 dependency"
2017-06-08 16:10:05 +00:00
Bartosz Fabianowski
519d288a70
Merge "Revert "Revert "Normalize building generic system image with treble-common.mk""" into oc-dev
...
am: 40b59b8950
2017-06-08 10:22:03 +00:00
Bartosz Fabianowski
74066efb32
Merge "Revert "Normalize building generic system image with treble-common.mk"" into oc-dev
...
am: 8199b9d1fd
2017-06-08 10:16:31 +00:00
Bartosz Fabianowski
40b59b8950
Merge "Revert "Revert "Normalize building generic system image with treble-common.mk""" into oc-dev
2017-06-08 10:13:31 +00:00
Bartosz Fabianowski
bf1546c96d
Revert "Revert "Normalize building generic system image with treble-common.mk""
...
We will selectively revert on a branch only.
This reverts commit 85c4945f46
2017-06-08 10:12:43 +00:00
Bartosz Fabianowski
8199b9d1fd
Merge "Revert "Normalize building generic system image with treble-common.mk"" into oc-dev
2017-06-08 09:45:59 +00:00
Bartosz Fabianowski
85c4945f46
Revert "Normalize building generic system image with treble-common.mk"
...
Revert by Build Cop. This change is causing build failures across builders and branches, e.g.:
ninja: error: 'out/target/product/generic_x86/obj/lib/android.hidl.base@1.0.so', needed by 'checkbuild', missing and no known rule to make it
09:08:08 ninja failed with: exit status 1
This reverts commit 76ada93856
2017-06-08 09:44:49 +00:00
SzuWei Lin
78b8dd61b1
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
Change-Id: I4202454d57970cef713f7d6437191094df0009e9
2017-06-08 16:24:10 +08:00
Isaac Chen
8c7dffd7bf
Merge "Normalize building generic system image with treble-common.mk" into oc-dev
...
am: 317e4b918d
2017-06-08 08:10:28 +00:00
Isaac Chen
317e4b918d
Merge "Normalize building generic system image with treble-common.mk" into oc-dev
2017-06-08 07:47:12 +00:00
Dan Willemsen
c401a62d81
Add mising AAPT2 dependency
...
Bug: 33381544
Test: m clean; mma -j with a prebuilt aar using aapt2
Change-Id: Ie41def84aa35f3774abd6d713fb4a75d63a88876
2017-06-08 00:14:32 -07:00
SzuWei Lin
76ada93856
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 configuations
Bug: 37927875
Test: boot to home screen with the generic system image
Change-Id: I4202454d57970cef713f7d6437191094df0009e9
Merged-In: I4202454d57970cef713f7d6437191094df0009e9
2017-06-08 10:13:23 +08:00
