Commit graph

13848 commits

Author SHA1 Message Date
Dan Willemsen
e49ee7095f Enforce TARGET_USES_MKE2FS := true for new devices
Bug: 62434479
Test: verify failure on 27 device w/o TARGET_USES_MKE2FS
Test: verify success on 27 device w/ TARGET_USES_MKE2FS
Test: `build/test/build_test.sh -only-config` on oc-mr1-dev and master
Change-Id: Ib7e8dad404a1eaf70f47ee1d46528be4aabd6e80
2017-09-29 22:56:30 +00:00
Mathieu Chartier
4876229afd Add support for profiles without preopt
Add and push profiles for apps that are not preopted. This will be
used to enable speed-profile during first boot if required.

Also add missing handling to have profiles properly named for
compressed APKs.

Test: make and flash
Bug: 38032017
Bug: 64503246

Change-Id: Ie1fbb5ed5a5d7e1e0be05f62aff1f4881a3bd1be
2017-09-19 08:50:50 -07:00
Mathieu Chartier
0fbb836cf6 Add product property for preopting extracted APKs
The property is PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK. If specified,
this preopts the APK with the default compile filter (quicken).

This will be used to quicken preopt of gmscore dynamite modules when
preopting is disabled. This fixes a possible RAM regression caused
by running out of the APK.

Bug: 65601274
Test: make and flash

Change-Id: Ibf0fa73ee7fafd9735e587baf19c4950a7da817a
2017-09-18 12:43:49 -07:00
Adam Seaton
1bc297f5a4 Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2
am: 6b7c615cb6

Change-Id: Icf400abc60bc19454782c54502f19268e67dd240
2017-09-13 21:52:55 +00:00
Adam Seaton
3d2a4f8363 Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131
am: 8e3eac06fb

Change-Id: I4fd03c02fc470cc1738effa2d1209503ca717ded
2017-09-13 21:52:44 +00:00
Adam Seaton
6b7c615cb6 Update Security String to 2017-11-05 on oc-dev bug:65631379
am: d24487a2f2

Change-Id: Ib474659c9e72e5ad803a0e28f9fb11b7057d4939
2017-09-13 21:30:22 +00:00
Adam Seaton
8e3eac06fb Update Security String to 2017-11-01 on oc-dev bug:65631379
am: 8f4a4c2131

Change-Id: Iee28cf19c5020c8dde26c1a25a92609ee7221c8d
2017-09-13 21:29:44 +00:00
Adam Seaton
d24487a2f2 Update Security String to 2017-11-05 on oc-dev bug:65631379 2017-09-13 10:51:18 -07:00
Adam Seaton
8f4a4c2131 Update Security String to 2017-11-01 on oc-dev bug:65631379 2017-09-13 10:46:41 -07:00
Jaekyun Seok
106fa4f771 Support excluding overlays when enforcing RRO
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS will be used to specify overlays
to be excluded from enforcing RRO.

The excluded overlays will be applied into the original package.

Bug: 63600240
Bug: 65001751
Test: succeeded building with
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := \
    vendor/google/google_overlay/static_only \
    vendor/google/nexus_overlay/common/static_only
and confirmed that config_webview_packages existed in framework-res.apk
with the overlayed value, but not in framework-res__auto_generated_rro.apk.

Merged-In: I0bfb44fc7726710bb78d9100404bc6dd29d06a73
Change-Id: I0bfb44fc7726710bb78d9100404bc6dd29d06a73
(cherry picked from commit ccee95e6ec)
2017-09-08 10:40:11 +09:00
Ian Pedowitz
62a835d0ef DO NOT MERGE OC-MR1 is REL
Bug: 64982450
Test: manual
Change-Id: I054e3ecff49803e61e7741753fe6764a567d72c4
2017-09-06 13:12:42 -07:00
Michael Schwartz
c5027d6e7d Merge "Include vbmeta.img into <product>-img.zip" into oc-mr1-dev 2017-09-06 16:47:32 +00:00
Bowgo Tsai
6bbb11a620 Include vbmeta.img into <product>-img.zip
Bug: 65227202
Test: make dist, checks vbmeta.img is included in <product>-img.zip
Change-Id: I3e09f036441bcf7e98d8f76360df1e17466ae38e
2017-09-06 09:30:32 +08:00
TreeHugger Robot
d7314b90bd Merge "Update compatibility matrix logic." into oc-mr1-dev 2017-09-05 20:54:27 +00:00
Mathieu Chartier
b9cd7e6ade Merge "Fix boot image profile in make files" into oc-mr1-dev 2017-09-01 02:47:09 +00:00
Mathieu Chartier
75edf540e2 Fix boot image profile in make files
Update location to framework/base/config instead of frameworks/base

Fixed dex2oat dependency to my_out_boot_image_profile_location
instead of my_out_profile_location.

Bug: 37966211
Test: make and flash

Change-Id: I446f11216cf6342861bbbf56ac5c4da2f36fb755
2017-08-31 12:35:21 -07:00
Steven Moreland
5bce7f201e Update compatibility matrix logic.
Use c_m.<level>.xml for matrices which correspond
to released API levels.

Test: manual
Test: build system complains when files are missing
Bug: 63603463
Change-Id: I16bcab9a7548876ec2bedf9c5d70a126ac50b8d5
2017-08-30 14:48:08 -07:00
Guang Zhu
73c10bed93 add CTS tradefed harness dependencies to PDK fusion config
Bug: 38448863
Test: make platform-java, config zip contains added directories
Change-Id: I49627ff9eac5effecb577b3d93ee0e24b3b4ab83
2017-08-30 12:42:45 -07:00
Mathieu Chartier
e7bda08941 Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY" into oc-mr1-dev 2017-08-29 23:13:32 +00:00
TreeHugger Robot
afb81de1f2 Merge "dex_preopt: Use the unstripped jar file for generating profiles." into oc-mr1-dev 2017-08-29 08:43:34 +00:00
Mathieu Chartier
418258cee9 Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
Renamed WITH_DEXPREOPT_BOOT_IMG_ONLY to
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY and changed the
behavior accordingly.

Preopt system server jars since selinux prevents system server from
loading anything from /data. If we don't do this they will need to
be extracted which is not favorable for RAM usage or performance.

Test: make and flash and look at system server maps
Bug: 65122284
Bug: 62356545
Change-Id: I49f2a23337fdd2bc2e628b683d26a0c135b2aabe
2017-08-28 18:40:30 -07:00
TreeHugger Robot
9d96622be4 Merge "Fix potential build break" into oc-mr1-dev 2017-08-27 23:52:27 +00:00
Hung-ying Tyan
b260f0d557 Fix potential build break
When BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED is enabled, the build system
may attempt to create a symlink in TARGET_ROOT_OUT before TARGET_ROOT_OUT
is created. Also make the symbolic link depend on
INSTALLED_DEFAULT_PROP_TARGET so that the symbolic link is properly created
when only bootimage is made.

Bug: 63645797
Test: on non-A/B device, make installclean && make bootimag and then verify
      that the symbolic link exists at $(TARGET_ROOT_OUT)/default.prop
Change-Id: Ied7b32abd7a5fd5456c4cb5ff68a56debe6254b7
(cherry picked from 58c1b0426f)
2017-08-25 23:24:24 +08:00
Narayan Kamath
bbcdc07d12 dex_preopt: Use the unstripped jar file for generating profiles.
We were previously using LOCAL_BUILT_MODULE, which wouldn't work in the
case that "nostripping" wasn't specified (i.e when we stripped).

The issue is that the built module has its classes.dex entry stripped,
which means that profman can't do anything meaningful with it.

In this change, we use the right set of files for JAVA_LIBRARIES as well
as prebuilt PACKAGES. Fixing apps built from source is a larger task and
has been left for a future change. Depending on ART changes, we might
need to disable stripping for all apps and/or align userdebug and user
builds with each other. This will be tackled separately.

Test: make
Bug: 64896089
Change-Id: I4fd256d187b66763f354cc6001953469c2cd8fbb
2017-08-24 11:31:03 +01:00
Michael Wright
5d8410b60a O MR1 is API 27
Bug: 64982450
Test: manual
Change-Id: I0d59724f1bcb8091488f23cd5d98d2688009b605
2017-08-23 18:23:06 -07:00
Adam Seaton
bf413aa70d Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
am: f3ae135ddb

Change-Id: If58e6b190e312f3fd4eb600b18689f396c8efb2f
2017-08-22 22:48:23 +00:00
Adam Seaton
90b1c82d83 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
am: 834db8c201

Change-Id: I2acc807fc3b4fdaea5592ea0b885cb206284a211
2017-08-22 22:47:53 +00:00
Adam Seaton
f3ae135ddb Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
am: ce4bc47c74

Change-Id: Idc4c93c54a778c37b5d916ef9dc71eaafc8eff89
2017-08-22 22:37:48 +00:00
Adam Seaton
834db8c201 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
am: fce94e0000

Change-Id: I26c3283c5fd33ee1e930840ad6b82019eba1ebc6
2017-08-22 22:37:00 +00:00
Adam Seaton
4e140ce86a Update platform security string to 2017-10-05 in oc-dev Bug:64896113 2017-08-21 11:37:32 -07:00
Adam Seaton
80d3742026 Update platform security string to 2017-10-01 in oc-dev Bug:64896113 2017-08-21 11:36:54 -07:00
TreeHugger Robot
ee67a45175 Merge "cxx_stl_setup is not executed for modules from soong" into oc-mr1-dev 2017-08-18 18:31:14 +00:00
Jiyong Park
82962a982c cxx_stl_setup is not executed for modules from soong
cxx_stl_setup is adding libunwind_llvm to the dependency even for
modules from soong. However, since this dependency was already handled
in soong, those modules don't need to go through it again.

Bug: 64815735
Test: BOARD_VNDK_VERSION=current mma -j (under /hardware/libhardware)

Merged-Id: Id6e2547c752ec831aa56a14c0bf4db0a55d51243
Change-Id: Id6e2547c752ec831aa56a14c0bf4db0a55d51243
(cherry picked from commit 425d489cb9)
2017-08-18 14:16:11 +09:00
TreeHugger Robot
b726558507 Merge "Copy adbd from system/bin to recovery/root/sbin" into oc-mr1-dev 2017-08-18 03:52:36 +00:00
TreeHugger Robot
f01a5ef7c3 Merge "oc-mr1-dev is now 8.1.0" into oc-mr1-dev 2017-08-16 20:39:27 +00:00
Narayan Kamath
fd6cbbe609 Merge "apkcerts: Add information about the compressed state of the APK." into oc-mr1-dev 2017-08-15 08:28:25 +00:00
Bowgo Tsai
3147e7cfab Copy adbd from system/bin to recovery/root/sbin
This change will be submitted with other changes moving adbd from
root/sbin to system/bin. We need to copy it specifically to recovery root.
Previously it was copied by rsync $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT).

Bug: 63910933
Test: normal boot sailfish, checks adb works
Test: recovery boot sailfish, checks adb works
Test: normal boot bullhead, checks adb works
Test: recovery boot bullhead, checks adb works

Change-Id: Ib49605f97a190aec2648cb000d1159b6e15db673
2017-08-15 11:33:17 +08:00
bohu
a508578811 sdk: add vendor-qem.img into the deps list
if it exists. Fix master-without-vendor sdk_x86-sdk build

Change-Id: I5656e7124d30e71120044cce668c54793f77208a
2017-08-14 14:52:20 -07:00
Bo Hu
60df0a831c Merge changes from topic "port-emu-to-oc-mr1-dev" into oc-mr1-dev
* changes:
  emulator: squash misc modifications from oc-emu-dev
  emualtor: keep libopenjdkjvmti*.so on sdk images
  emulator: move rild.libpath to vendor
  sdk:enable emulator to launch in build environment
  build-emulator: fully treblize emulator image
  Build vendor image for emulator
2017-08-14 18:34:57 +00:00
Narayan Kamath
6a4bd696f6 apkcerts: Add information about the compressed state of the APK.
We add a compressed="$extension" attribute to an APK's entry if it's
compressed.

Bug: 64531948
Test: make dist

Change-Id: Ic3f95ed77f0bb16dec825bae944c70ee2d130657
2017-08-14 14:50:28 +01:00
bohu
753e9e4462 emulator: squash misc modifications from oc-emu-dev
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-13 22:32:01 -07:00
bohu
e5e0742444 emualtor: keep libopenjdkjvmti*.so on sdk images
BUG: 38353037

Those libopenjdkjvmti*.so files are needed by profilers.
Those files are shipped on real devices as well.

Change-Id: Iac7dd2844b0f3ea5194dec8732fbaacf53c4bf4a
2017-08-13 22:31:53 -07:00
Yahan Zhou
c61b6bd2ed Build vendor image for emulator
BUG: 37511975

Test: lunch sdk_gphone_x86-user, make with dist option, unzip
sdk_gphone_x86-emulator-eng.xxxx.zip to system image folder, emulator
can boot

Change-Id: I75b9f0de17fece3dec5ae1662400808af321bd4d
2017-08-13 22:28:58 -07:00
TreeHugger Robot
025d5d910b Merge "treble_common.mk: add the vbmeta.img to disable verification" into oc-mr1-dev 2017-08-12 04:00:18 +00:00
Mathieu Chartier
4f3bce897b Merge "Add dirty-images-objects handling to boot image build." into oc-mr1-dev 2017-08-11 16:32:26 +00:00
Narayan Kamath
2f6b55266a Merge "Implement LOCAL_COMPRESSED_MODULE." into oc-mr1-dev 2017-08-11 09:30:33 +00:00
Jeff Hao
4ae165c7ae Add dirty-images-objects handling to boot image build.
Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.

Bug: 62554875
Test: mm test-art-host

(cherry picked from commit 865d54caf2)

Change-Id: Id711ad1c2d98b12b0f55a29acca8a96834d69ede
2017-08-10 15:21:44 -07:00
Narayan Kamath
7c205107ce Implement LOCAL_COMPRESSED_MODULE.
- Prebuilts with LOCAL_MODULE_CLASS == APPS and BUILD_PACKAGE that
  define LOCAL_COMPRESSED_MODULE := true will be installed compressed
  in the system partition.
- The compression algorithm is simple gzip for now.

In addition :
- Compressed modules are not dex-preopted.
- JNI shared libraries are always embedded inside compressed modules,
  they are never installed as separate files on the FS.

Test: Manual
Bug: 63802184

Change-Id: Id12b1ff0b1d68791ec1178783f7e78910e122a33
2017-08-10 12:38:11 +01: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
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
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
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
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
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
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
TreeHugger Robot
7740a78495 Merge "Fix potential build break" into oc-dev 2017-07-24 16:50:08 +00:00
Adam Seaton
a8772230d1 Merge changes I7c8a25a2,Ifb32d061 into oc-dev am: 683c44c812
am: c7d9294cd9

Change-Id: Iea69629779d87a7a6ae74216076f1093f13931b0
2017-07-20 21:10:44 +00:00
Adam Seaton
c7d9294cd9 Merge changes I7c8a25a2,Ifb32d061 into oc-dev
am: 683c44c812

Change-Id: Ifd90edf581b976684da3a5b9fa2a6dc3ac7102da
2017-07-20 20:57:46 +00:00
Colin Cross
443529098c Merge "Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25 am: 96018b3d10" into oc-dr1-dev-plus-aosp
am: 00f21a2360

Change-Id: Ib1186289e955e0b6f35285a192b2e02d8996f4ee
2017-07-19 23:08:25 +00:00
Colin Cross
f2da657628 Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25
am: 96018b3d10

Change-Id: Ib54b8c0fbb95179bff97abe028d133da3528380f
2017-07-19 22:58:23 +00:00
Colin Cross
96018b3d10 Merge "Revert "Use java prebuilts"" am: 4d69df5191
am: f4e78ccf25

Change-Id: I1b0bfaa059f68e09c115662ca9f850213305b8f0
2017-07-19 22:55:23 +00:00
Colin Cross
f4e78ccf25 Merge "Revert "Use java prebuilts""
am: 4d69df5191

Change-Id: I978bf3d25e0be2a2a6b40c5b396821cc2a8d9365
2017-07-19 22:52:21 +00:00
Colin Cross
4d69df5191 Merge "Revert "Use java prebuilts"" 2017-07-19 22:44:12 +00:00
Colin Cross
02112900cc Revert "Use java prebuilts"
This reverts commit 1931750940.

Change-Id: I7a99fd6c53d35a2a674f2d60b113a727f3c453ce
2017-07-19 22:42:46 +00:00
Colin Cross
0141bf4008 Merge "Merge "Merge "Use java prebuilts" am: 26e1b6d6c2 am: fcbaa25380" into oc-dev-plus-aosp am: 7b38914e4e" into oc-dr1-dev-plus-aosp
am: d2d0e31200

Change-Id: Iea40d864193eead68603aac150a5e02d0060728d
2017-07-19 22:24:35 +00:00
Colin Cross
1a05e52e6d Merge "Merge "Use java prebuilts" am: 26e1b6d6c2 am: fcbaa25380" into oc-dev-plus-aosp
am: 7b38914e4e

Change-Id: I61313e8009c964868cf4984a7f86811748e98819
2017-07-19 22:19:03 +00:00
Colin Cross
7d7f4cd7bb Merge "Use java prebuilts" am: 26e1b6d6c2
am: fcbaa25380

Change-Id: I27e44fa8d649092327b3543f440fae65b36c054c
2017-07-19 22:16:07 +00:00
Colin Cross
fcbaa25380 Merge "Use java prebuilts"
am: 26e1b6d6c2

Change-Id: If761856f9fd509d2c5694844b6bb10966717e0b1
2017-07-19 22:13:09 +00:00
Colin Cross
26e1b6d6c2 Merge "Use java prebuilts" 2017-07-19 22:08:48 +00:00
Adam Seaton
32f388f655 Updating Security String to 2017-09-05 Bug:63846344 2017-07-19 10:42:03 -07:00
Adam Seaton
f1c17f17ff Updating Security String to 2017-09-01 Bug:63846344 2017-07-19 10:41:05 -07:00
Hung-ying Tyan
58c1b0426f Fix potential build break
When BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED is enabled, the build system
may attempt to create a symlink in TARGET_ROOT_OUT before TARGET_ROOT_OUT
is created. Also make the symbolic link depend on
INSTALLED_DEFAULT_PROP_TARGET so that the symbolic link is properly created
when only bootimage is made.

Bug: 63645797
Test: on non-A/B device, make installclean && make bootimag and then verify
      that the symbolic link exists at $(TARGET_ROOT_OUT)/default.prop
Change-Id: Id12916b465ff052e2594b79f28274be20ca53af7
Merged-In: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
2017-07-19 22:42:05 +08:00
Tobias Thierer
5a00891df9 Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1 am: 32b8d637dc am: 675d7d56e8
am: bce2e113b4

Change-Id: I58a4c89f9f564c633b1d1f8ee31f5b06b16fdc6b
2017-07-19 10:11:59 +00:00
Tobias Thierer
bce2e113b4 Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1 am: 32b8d637dc
am: 675d7d56e8

Change-Id: Iaccc55cb744edb3375173ea11ee040bb8c220f61
2017-07-19 10:06:30 +00:00
Tobias Thierer
675d7d56e8 Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1
am: 32b8d637dc

Change-Id: I337488a0d6d75f8f6635c57c916b6b337ff35f65
2017-07-19 10:01:00 +00:00
Tobias Thierer
32b8d637dc Merge "Make 'make docs' work on OpenJDK 9 toolchain."
am: 8003d944a1

Change-Id: Ib15f74276865c690631e709d002920cc2a63494c
2017-07-19 09:55:30 +00:00
Tobias Thierer
8003d944a1 Merge "Make 'make docs' work on OpenJDK 9 toolchain." 2017-07-19 09:49:33 +00:00
Steven Moreland
c0ee08020a Merge "Remove JNI_H_INCLUDE from make." am: cc96704ad2 am: 2d05df376d am: f88b6bd7d8
am: 07d26d46d0

Change-Id: I09cf9fa8fc080ec486d801fb143e5782e16f4fc4
2017-07-19 01:51:33 +00:00
Ivan Lozano
3d055100c9 Merge "Allow integer_overflow sanitizer path exclusion." am: ad9dde8a86 am: 815c1f5941 am: 7e18525ef7
am: d86676e30a

Change-Id: Ic23f9dcef1a3c97a67c98f3af4fb636b0c825628
2017-07-19 01:50:35 +00:00
Steven Moreland
07d26d46d0 Merge "Remove JNI_H_INCLUDE from make." am: cc96704ad2 am: 2d05df376d
am: f88b6bd7d8

Change-Id: Idd3421a6e4c23186fe689f57bd252a7276b84799
2017-07-19 01:46:32 +00:00
Steven Moreland
f88b6bd7d8 Merge "Remove JNI_H_INCLUDE from make." am: cc96704ad2
am: 2d05df376d

Change-Id: I26ee312c390514a55e03628bfb6d6496588feba7
2017-07-19 01:44:32 +00:00
Steven Moreland
2d05df376d Merge "Remove JNI_H_INCLUDE from make."
am: cc96704ad2

Change-Id: I91ff6ba31fb53960f00398777f1f213dbcda10a8
2017-07-19 01:40:32 +00:00
Ivan Lozano
d86676e30a Merge "Allow integer_overflow sanitizer path exclusion." am: ad9dde8a86 am: 815c1f5941
am: 7e18525ef7

Change-Id: Ie34681ed0c12c77cd45f7b7ebb5bc636a9dd4d9f
2017-07-19 01:34:32 +00:00
Treehugger Robot
cc96704ad2 Merge "Remove JNI_H_INCLUDE from make." 2017-07-19 01:33:50 +00:00
Ivan Lozano
7e18525ef7 Merge "Allow integer_overflow sanitizer path exclusion." am: ad9dde8a86
am: 815c1f5941

Change-Id: Ica0a1e973f7cc6794866d6317ddff39fa72edc9a
2017-07-19 01:19:36 +00:00
Ivan Lozano
815c1f5941 Merge "Allow integer_overflow sanitizer path exclusion."
am: ad9dde8a86

Change-Id: Ib1dad032780d7c3ac36b69a3350bd1b07f9a1358
2017-07-19 01:14:40 +00:00