Commit Graph

38950 Commits

Author SHA1 Message Date
TreeHugger Robot 1987fd6f2b Merge "Don't add .vendor suffix for vendor-only modules" into oc-mr1-dev 2017-08-01 23:13:04 +00:00
Bo Hu bc88ff69cf Revert "Revert "emulator: create qemu images for system,vendor""
This reverts commit 9b99ddc8a5.
and add syste-qemu.img to the dependency list of sdk target

BUG: 64235252

Test: build sdk target successfully

(cherry picked from commit f0d50bbef0)

Change-Id: I813233c7c3f06eb1eca18aad5ea890a55814eb1b
2017-08-01 14:34:15 -07:00
TreeHugger Robot 0914778538 Merge "oc-mr1-dev is OC-MR1, don't allow building beyond it" into oc-mr1-dev 2017-08-01 19:13:15 +00:00
TreeHugger Robot 69d01b4fff Merge "add legacy-android-test java library to PDK platform.zip" into oc-mr1-dev 2017-07-31 23:12:49 +00:00
Niranjan Pendharkar 593767a780 update new HIDL interfaces in generic system image
am: 4584215b55

Change-Id: I644f7e1a1d4ceabbccecfb54914cc723021bac3b
2017-07-31 18:56:11 +00:00
TreeHugger Robot d4083602cc Merge "Adds the Neural Networks lib to the base configuration." into oc-mr1-dev 2017-07-29 23:55:40 +00:00
Ian Pedowitz 22c06e7c8e oc-mr1-dev is OC-MR1, don't allow building beyond it
Bug: 63544673
Test: Can't lunch marlin-userdebug-PPR1
$ lunch marlin-userdebug-PPR1
build/core/version_defaults.mk:55: Invalid TARGET_PLATFORM_VERSION 'PPR1', must be one of
build/core/version_defaults.mk:56: *** OPM1.  Stop.

Change-Id: I116b0cebb353600277876eabccf41e7dda736151
Merged-In: I2d9019af8c4e24e34c743be85d4e0ff224de9d17
2017-07-28 11:12:19 -07:00
Niranjan Pendharkar 4584215b55 update new HIDL interfaces in generic system image
Test: Boot to home screen
Bug: 36682246
Change-Id: Ia856ed0929caa0c089a62100d17f717519ae5ebf
2017-07-28 08:30:03 -07:00
SzuWei Lin 0f0cc8a17f Add new products aosp_x86_ab and aosp_x86_64_ab
The product is for GSI with x86 64-bits and 32-bits with A/B
update.

Bug: 38339398
Test: Build pass
Change-Id: I1f945a812e0fbf8c4266d2f91624c2c674941383
Merged-In: I1f945a812e0fbf8c4266d2f91624c2c674941383
(cherry picked from commit 06956fe54c)
2017-07-28 11:40:25 +08:00
SzuWei Lin e4648214e8 Add new products aosp_x86_a and aosp_x86_64_a
The product is for GSI with x86 64-bits and 32-bits without A/B
update.

Bug: 38339837
Test: Build pass and boot to home screen on 32/64-bits x86 emulator
      by replacing system image with GSI
Change-Id: I9f956bc35ba5700900df7c2fca45bf794684a418
Merged-In: I9f956bc35ba5700900df7c2fca45bf794684a418
(cherry picked from commit 4b189c810e)
2017-07-28 11:39:56 +08:00
SzuWei Lin e572132aa6 Add new product aosp_arm_ab
The product is for GSI with ARM 32-bits and A/B update.

Bug: 38339485
Test: Build pass
Change-Id: Ifad208d2e625f30d0a3dd964d53d81257eeefabf
Merged-In: Ifad208d2e625f30d0a3dd964d53d81257eeefabf
(cherry picked from commit fbc4835faa)
2017-07-28 11:39:40 +08:00
SzuWei Lin 9821e00caa Share system properties with all GSI project with treble_system.prop
Use TARGET_SYSTEM_PROP to assign a common system property file in each
GSI BoardConfig.mk

Bug: 62647757
Test: make and check the file system/build.prop in out folder
Change-Id: Ifb3e02356869f97573a3690a6d67c2b4a9471c46
Merged-In: Ifb3e02356869f97573a3690a6d67c2b4a9471c46
(cherry picked from commit 7e10169909)
2017-07-28 11:38:59 +08:00
TreeHugger Robot 1a7473c297 Merge "Apks are again allowed to use vendor libs as before" into oc-mr1-dev 2017-07-28 00:19:39 +00:00
Keun-young Park 37ae422c6f add legacy-android-test java library to PDK platform.zip
- Partners building java test using legacy test API needs it.

bug: 64121067
Test: make platform-java and check if library is in platform.zip
Change-Id: If831f8cc89a386ccb51f46935667057efb3cdf91
2017-07-27 21:27:16 +00:00
Jiyong Park 1a5c2dcdc8 Don't add .vendor suffix for vendor-only modules
Soong now adds .vendor suffix only for modules having both core and
vendor variants. Furthermore, names listed in LOCAL_SHARED_LIBRARIES
are correct (= have .vendor suffix when the dependent lib has variants).
Therefore, make does not need to force add .vendor suffix when parsing
modules from soong.

Bug: 37480243
Test: BOARD_VNDK_VERSION=current m -j <name> is successful, where <name>
is one of the vendor-only libraries in Soong. (i.e.
android.hardware.renderscript@1.0-impl)
Test: m -j does not break anything

Merged-In: Id8d0d01313c63496a10de4cd3ddb9f75180efef6
Change-Id: Id8d0d01313c63496a10de4cd3ddb9f75180efef6
(cherry picked from commit a9c4c71756)
2017-07-27 09:47:55 +09:00
Jiyong Park eb2e568df2 Apks are again allowed to use vendor libs as before
When BOARD_VNDK_VERSION is set, native libs that were labeled as
native:platform are now divided into native:platform and native:vendor
sets depending on their install locations. In order to keep the existing
apks to use all the libraries that they have been using, native:vendor
is also added to the allowed types for apks.

However, in the future when we have vendor SDK and enforce all vendor
apks to use the vendor SDK, we will disallow native:vendor to
app:platform and native:vendor will be allowed only to those vendor apks
(probably labeled as app:vendor).

Bug: 33241851
Test: BOARD_VNDK_VERSION=current m <a vendor lib using vendor jni>
(e.g. ModemDiagnosticSystem in internal master)

Change-Id: I6ad0967ab17f07be9657b58c20fa9b96bd1a342b
Merged-In: I6ad0967ab17f07be9657b58c20fa9b96bd1a342b
2017-07-26 10:59:57 -07:00
Lucas Dupin 203de1108f Merge "Removed overlay from target" into oc-dr1-dev
am: eb42aa7438

Change-Id: If2720dcb6e3c376f968e454fb734f3443c5a3080
2017-07-25 23:23:03 +00:00
TreeHugger Robot eb42aa7438 Merge "Removed overlay from target" into oc-dr1-dev 2017-07-25 17:40:03 +00:00
Ian Pedowitz 0f61372f57 DO NOT MERGE Setting build_id to OC-MR1 for oc-mr1-dev
Bug: 63544673
Test: lunching a target shows 'BUILD_ID=OC-MR1'
Change-Id: I0cb3cf6fa27a92a173e40945ad701ccf29bd4d0e
2017-07-24 19:20:32 -07:00
Lucas Dupin 3297613a43 Removed overlay from target
Lock screen colors won't be handled by overlays anymore.

Test: make
Bug: 63751714
Change-Id: I496575d62ab326e7bb774643fac6fcb8d6c801a1
2017-07-24 13:29:26 -07:00
Hung-ying Tyan 76c0e76413 Merge "Fix potential build break" into oc-dev am: 7740a78495 -s ours
am: 1a614a0856  -s ours

Change-Id: If4474aed7998bf4f4570ebdcc8c0eb6f00e97b4b
2017-07-24 17:12:38 +00:00
Hung-ying Tyan 1a614a0856 Merge "Fix potential build break" into oc-dev
am: 7740a78495  -s ours

Change-Id: Iee24871f486b8ef21e6992a101e97734377c6613
2017-07-24 17:07:37 +00:00
TreeHugger Robot 7740a78495 Merge "Fix potential build break" into oc-dev 2017-07-24 16:50:08 +00:00
Jorim Jaggi 2145739ff4 Merge "Revert "Removed overlay from target"" into oc-dr1-dev
am: 8a7f2128b3

Change-Id: If4242cbe667e689662ba2323e986d35cf6c03f53
2017-07-24 14:13:41 +00:00
Jorim Jaggi 8a7f2128b3 Merge "Revert "Removed overlay from target"" into oc-dr1-dev 2017-07-24 14:07:55 +00:00
Jorim Jaggi fa794173fe Revert "Removed overlay from target"
This reverts commit fd2b1807ca.

Fixes crashloop with lock pattern

Change-Id: I6f15c18e7a10d6755ab151bb976616e753e520a3
Fixes: 63980375
2017-07-24 13:55:19 +00:00
Lucas Dupin 33d42fbb0e Merge "Removed overlay from target" into oc-dr1-dev
am: 67afad200d

Change-Id: I4d01fdbffe8dd0c61c8adb9dd4c855b99dbf8ca3
2017-07-22 04:51:03 +00:00
TreeHugger Robot 67afad200d Merge "Removed overlay from target" into oc-dr1-dev 2017-07-22 04:46:20 +00:00
Jean-Luc Brouillet 4f612c6f36 Adds the Neural Networks lib to the base configuration.
This will ensure that the library is on all devices even
if no builtin apps uses the lib.

Bug: 63905942
Test: Ran an application that uses the NN API.
Change-Id: I52ce6142f94d21ca55fa26875fab3f4926e2c6bb
2017-07-21 20:13:14 -07:00
Tao Bao 7a0a560c15 Merge "Look for non-existent files listed in avb_vbmeta_args." into oc-dr1-dev
am: 9c77abd6f2

Change-Id: Id96d37fd4e4ca639d3ed15e8472f1f2b2953e1ff
2017-07-21 17:18:00 +00:00
Tao Bao 9c77abd6f2 Merge "Look for non-existent files listed in avb_vbmeta_args." into oc-dr1-dev 2017-07-21 17:11:40 +00:00
Tao Bao 1dc5d47653 Look for non-existent files listed in avb_vbmeta_args.
In BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS, if we have defined
"--include_descriptors_from_image" with an image file whose path points
to source tree, add_img_to_target_files.py or sign_target_files_apks.py
may fail to find the file. Because these scripts may run without a
source tree, by taking target_files.zip as the only input.

This CL scans additional locations in the input target_files.zip to find
those missing files in avb_vbmeta_args. As long as the files are included
in the target_files.zip, they get a second chance to be found.

Bug: 63910867
Test: As follows:
 1. Setup BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS with a local file path;
 2. Remove the local file;
 3. sign_target_files_apks.py fails without this CL;
 4. sign_target_files_apks.py works.
Change-Id: I3c58f80a5535db02b74cfe40d0c0beff72587cf8
2017-07-21 01:20:14 -07:00
Pawin Vongmasa c194d53411 Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev
am: 8fc04cc40a

Change-Id: I841a7739d2ec7de3945b04dce1609d071287f8dc
2017-07-20 23:11:35 +00:00
TreeHugger Robot 8fc04cc40a Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev 2017-07-20 23:06:38 +00:00
Adam Seaton 56c43fefd9 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours am: a65c03517e -s ours am: 1215b2f770 -s ours am: 5c7aef3747 -s ours am: ff70113263
am: 302f80a992

Change-Id: I6054b5e9bd43ab6f65b829201c2e755cb106ac8a
2017-07-20 21:42:47 +00:00
Adam Seaton 302f80a992 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours am: a65c03517e -s ours am: 1215b2f770 -s ours am: 5c7aef3747 -s ours
am: ff70113263

Change-Id: I11021275894122faa1db94e927fd6f801eb8acda
2017-07-20 21:40:17 +00:00
Adam Seaton 2e5d8a9b01 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 am: 19ebbf50a4 am: 9f13a87b82 -s ours am: 54b51dc69a
am: 09b926c699

Change-Id: Ic7b05cd05e835b26ee3a0807b42a6bfeb8d17a94
2017-07-20 21:38:18 +00:00
Adam Seaton ff70113263 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours am: a65c03517e -s ours am: 1215b2f770 -s ours
am: 5c7aef3747  -s ours

Change-Id: Iea1f7cca1c2973b7c761d08ef86d4b601576dd67
2017-07-20 21:38:16 +00:00
Adam Seaton 5c7aef3747 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours am: a65c03517e -s ours
am: 1215b2f770  -s ours

Change-Id: Id1e28c7a431fa76634aa7ea8010721c3578d75e5
2017-07-20 21:36:19 +00:00
Adam Seaton 09b926c699 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 am: 19ebbf50a4 am: 9f13a87b82 -s ours
am: 54b51dc69a

Change-Id: Ib0d67b51629889909ef645e4181dd4b4159f4ebd
2017-07-20 21:36:16 +00:00
Adam Seaton 54b51dc69a Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 am: 19ebbf50a4
am: 9f13a87b82  -s ours

Change-Id: I909711741b28cb8e2f2df8339276f3d79fec1e06
2017-07-20 21:34:15 +00:00
Adam Seaton 1215b2f770 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours
am: a65c03517e  -s ours

Change-Id: I5ed187e174d8acfe59076da5af02b1135b1a9955
2017-07-20 21:34:15 +00:00
Adam Seaton 9f13a87b82 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8
am: 19ebbf50a4

Change-Id: I87ae76f73665edf2ba7004aaacb5f7cf27b8b108
2017-07-20 21:32:17 +00:00
Adam Seaton a65c03517e Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours
am: a562f661ca  -s ours

Change-Id: I7d9efb4dcd6f0adfff83cf21df4d4e76cd422526
2017-07-20 21:32:15 +00:00
Adam Seaton 19ebbf50a4 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d
am: 25eee603c8

Change-Id: If92333e458ee2f7a31141e1fb72c867ec60c800f
2017-07-20 21:29:46 +00:00
Adam Seaton a562f661ca Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d
am: 25eee603c8  -s ours

Change-Id: I1e180a225282a3bffe9c47334122f7580b2026a5
2017-07-20 21:29:45 +00:00
Adam Seaton 25eee603c8 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399
am: 0d1b7e183d

Change-Id: Ifc5eec2c2b43745f0d7bc61a670bc5c4b4cbdece
2017-07-20 21:27:45 +00:00
Adam Seaton 0d1b7e183d Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours
am: 15d200c399

Change-Id: I67a568b3e4c55df2fd57dc5af4ac32f3f037bbc9
2017-07-20 21:25:46 +00:00
Adam Seaton 15d200c399 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29
am: 2d28e0372a  -s ours

Change-Id: Ib8dfc0f08e2086b0161d9c7ad122103a95e1a709
2017-07-20 21:18:15 +00:00
Adam Seaton 2d28e0372a Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552
am: cfbb865e29

Change-Id: Idb5c1e9cc98cf9e235eaf4de07a94c26eec3455a
2017-07-20 21:10:44 +00:00