Commit graph

38924 commits

Author SHA1 Message Date
Jiyong Park
6ea81532ea Phony module vndk_package is added
This phony module aggregates all the VNDK-related libraries so that they
can be installed to the system partition simply by adding 'vndk_package'
to PRODUCT_PACKAGES. This is to sneure that all VNDK libraries are
installed even when there is no vendor library using some of the VNDK
libs (especially when building system image only).

Bug: 64013660
Test: BOARD_VNDK_VERSION=current m -j vndk_package
Change-Id: I3a14a7eaaffd6a7f3258a4be59b1c5813153714d
2017-08-10 14:11:41 +09:00
TreeHugger Robot
76a097786c Merge "Add new products aosp_x86_ab and aosp_x86_64_ab" into oc-mr1-dev 2017-08-10 05:07:37 +00:00
TreeHugger Robot
0ef22fd4ae Merge changes I9f956bc3,Ifad208d2,Ifb3e0235 into oc-mr1-dev
* changes:
  Add new products aosp_x86_a and aosp_x86_64_a
  Add new product aosp_arm_ab
  Share system properties with all GSI project with treble_system.prop
2017-08-10 04:46:30 +00:00
TreeHugger Robot
a32a8c0b43 Merge "build: aux: Fix link type checking for AUX builds" into oc-mr1-dev 2017-08-09 23:57:36 +00:00
Roozbeh Pournader
e3793d947f Enable Canadian English on L10n builds
Bug: 64491256
Test: mmma -j packages/apps/Settings (and checking the APK using aapt dump badging)
Change-Id: I1108802a89bd82ccc6e2cc0c2464b8e30eb796b4
2017-08-09 12:08:22 -07:00
Ian Pedowitz
47f1b93dfa v8.0.0 was only temporary. O-DR is 8.0.0
Fixes: 64130669
Fixes: 64125438
Fixes: 64437834
Test: Flashed oc-dr1-dev ToT and ensured device booted
Test: Rebuilt with topic:ODR-8.0.0 and reflashed without wipe
Test: device booted
Merged-In: I7894321971c0b696594deb064ebed3f43cf7c8d1
Change-Id: I1316358d0121b82902ac708088a49d480f3a6ad4
2017-08-09 12:06:37 -07:00
Roozbeh Pournader
c11e0eac1c Add en-XC (cracked pseudo-locale) to L10n build
Also sort the locales alphabetically (keeping en-US first) and move
them to separate lines.

Bug: 64394698
Test: none
Change-Id: I3aad3ce1ad9093ffe0ffdf56ebb6f287aec29d44
2017-08-09 00:05:13 +00:00
TreeHugger Robot
f2a63c19f3 Merge "thermal: Add Thermal HAL 1.1 to treble_common.mk" into oc-mr1-dev 2017-08-08 01:15:36 +00:00
Todd Poynor
614482f09f thermalserviced: add ThermalService daemon
Add ThermalService daemon to embedded.mk as part of the minimal build
of open source parts of the tree.

Test: manual on marlin
Bug: 30982366
Change-Id: I8315a8f5871ec24d8970deaa8527ee74db1c4dc7
(cherry picked from commit d006688090)
2017-08-07 23:02:56 +00:00
Todd Poynor
6197aba946 thermal: Add Thermal HAL 1.1 to treble_common.mk
Add rev 1.1 of Thermal HAL.

Test: VtsHalThermalV1_1TargetTest; plus manual on marlin
Bug: 30982366
Change-Id: Iaaef326e5d2bad05d934614b79c7c44e7592fdc4
(cherry picked from commit ca0adce235)
2017-08-07 23:02:01 +00:00
Calin Juravle
013be8766f Merge "Replace -classpath with --class-loader-context for preopt" into oc-mr1-dev 2017-08-07 21:32:58 +00:00
Amit Pawar
98c2735b82 oc-mr1-dev is now 8.1.0
Bug: 62103626
Test: In progress
Change-Id: I53d2248669892e200d1e5d966027f35f38a8a1f8
Merged-In: I2d9019af8c4e24e34c743be85d4e0ff224de9d17
2017-08-04 21:21:59 +00:00
Alexey Polyudov
19e0320ccb build: aux: Fix link type checking for AUX builds
AUX build environent is volatile and is only instantiated in
a context of AUX-aware module.
link-type checking is happening outside such context, and
is not able to correctly determine AUX build dependencies.

1. Save enough of context in LINK_TYPE variable;
   Use AUX-<variant-name> instead of AUX
2. Load correct set of AUX meta build vars before
   building link_type rules

Bug: 62060489
Test: make auxiliary

build no longer tries to access "/STATIC_LIBRARIES" path

Change-Id: I9764d4a0740da1c55a6f8429398872fc4362942c
(cherry picked from commit 55ebe631b4)
2017-08-04 12:45:02 -07:00
TreeHugger Robot
9a50c8507a Merge "Making a comment a bit more explicit" into oc-mr1-dev 2017-08-04 16:52:11 +00:00
SzuWei Lin
8b60c822ab Force generic system image to load dex pre-opt from system
Generic system image always generates dex pre-opt in system image,
to improve the time of first boot.

But the property ro.cp_system_other_odex could be defined in vendor
image, so we disable the property in generic system image to force
dex pre-opt be loaded from system image.

Bug: 62645784
Test: Test the patch on a A/B project with GSI, confirm the dex
      pre-opt is loaded from GSI.

Change-Id: I71b4a5bed517841b5f889d21d73429fa91da25ba
Merged-In: I71b4a5bed517841b5f889d21d73429fa91da25ba

(cherry picked from commit 5677b877fb)
2017-08-04 11:47:02 +08:00
Bart Sears
6cfcffff1e Merge "Change Android version to v8.0.0" into oc-dr1-dev
am: 1e91b2229b  -s ours

Change-Id: I36e3917bd472b395fe6740df1185a1b13cf72395
2017-08-04 02:56:32 +00:00
Bart Sears
1e91b2229b Merge "Change Android version to v8.0.0" into oc-dr1-dev 2017-08-04 02:50:52 +00:00
Ian Pedowitz
f28bf722c2 Making a comment a bit more explicit
Bug: 64364822
Test: N/A comment only
Change-Id: I4ef65aef4521326ac48539ad27422f881cc3e883
2017-08-03 17:38:26 -07:00
Bart Sears
a302746d9b Change Android version to v8.0.0
Change PLATFORM_VERSION.OPD1 to v8.0.0.  This is a temporary
change until we get a new KeyMaster that can handle going from
8.0.1 -> 8.0.0.  At that point we will change PLATFORM_VERSION
to 8.0.0.

Test: Check: Settings > System > About phone > Android version.
Also verified that update from 8.0.1 to v8.0.0 works (i.e. device
boots and shows new Android Version).
Bug: 64130669
Merged-In: I7894321971c0b696594deb064ebed3f43cf7c8d1
Change-Id: Ibb8fbb123a74196f57f649d0c22f58beefaf6d06
2017-08-03 16:23:59 -07:00
Calin Juravle
f33efbd03e Replace -classpath with --class-loader-context for preopt
Use --class-loader-context to pass the context to dex2oat instead of using
runtime arguments.

In preparation to simplify dex2oat handling of contexts.

Bug: 37966546
Bug: 38138251
Test: make & check that the prebuilds have '&' as their classpath key

(cherry picked from commit 965f8aec4c)

Change-Id: Id027e1fcbd69ac5e338214a03ae44222988544f3
2017-08-03 15:29:31 -07:00
TreeHugger Robot
e6883303c1 Merge "Revert "Revert "emulator: create qemu images for system,vendor""" into oc-mr1-dev 2017-08-02 20:04:13 +00:00
Yifan Hong
c718d8300b Merge "Vendor modules in make also have __ANDROID_VNDK__ defined." into oc-mr1-dev 2017-08-02 19:56:17 +00:00
Bowgo Tsai
9afc0d5349 treble_common.mk: add the vbmeta.img to disable verification
AVB should be disabled for Treble VTS. Otherwise, OEM devices cannot boot
the generic system.img provided by Google.

Bug: 64055917
Test: Compiles and boot a device with the vbmeta.img
Change-Id: I0eaae7beebc8b901d0b4766c2cdc34a27ad02b59
2017-08-02 21:15:26 +08:00
Yifan Hong
1287e59f15 Vendor modules in make also have __ANDROID_VNDK__ defined.
Bug: 64277220
Test: BOARD_VNDK_VERSION m -j
Change-Id: Ia9811ea526d0878b539c8c3da9e82e6bf33fe8e8
Merged-In: Ia9811ea526d0878b539c8c3da9e82e6bf33fe8e8
2017-08-01 18:54:26 -07:00
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