OSDN Git Service

android-x86/build.git
8 years agoMerge "Inform Jack of the min sdk" into nyc-dev
Yohann Roussel [Wed, 16 Mar 2016 15:41:58 +0000 (15:41 +0000)]
Merge "Inform Jack of the min sdk" into nyc-dev

8 years agoInform Jack of the min sdk
Yohann Roussel [Wed, 9 Mar 2016 16:19:58 +0000 (17:19 +0100)]
Inform Jack of the min sdk

Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.

Bug: 27371864

(cherry picked from commit c6383d6ec665a0d0c7c866890845c5735a298b6b)

Change-Id: Ieba0219494f29d2737d2ca234317c3af7e5e72c8

8 years agoMerge "Rebuild odex files in PDK fusion build." into nyc-dev
Ying Wang [Tue, 15 Mar 2016 21:23:49 +0000 (21:23 +0000)]
Merge "Rebuild odex files in PDK fusion build." into nyc-dev

8 years agoMerge "Fix warning of "overriding commands for target ...boot.oat"." into nyc-dev
Ying Wang [Tue, 15 Mar 2016 20:59:25 +0000 (20:59 +0000)]
Merge "Fix warning of "overriding commands for target ...boot.oat"." into nyc-dev

8 years agoFix warning of "overriding commands for target ...boot.oat".
Ying Wang [Tue, 15 Mar 2016 19:13:56 +0000 (12:13 -0700)]
Fix warning of "overriding commands for target ...boot.oat".

There seems to be bug in Kati that when we write it as:
LIBART_TARGET_BOOT_ART_EXTRA_FILES += boot.oat $(patsubst
%.art,%.oat,$(LIBART_TARGET_BOOT_ART_EXTRA_FILES))

boot.oat ends up in the value twice.
This works around the bug, filed as bug/27676615.

Bug: 27546601
Change-Id: Ifc330280496083a4c817e53bc5c77c86e48a2426

8 years agoRevert "Revert "build: pass version and patch level to mkbootimg""
Sami Tolvanen [Tue, 15 Mar 2016 16:49:30 +0000 (16:49 +0000)]
Revert "Revert "build: pass version and patch level to mkbootimg""

This reverts commit 494a9090f96a7fc4e77f8f4fbb26d876a5fc8438.

Bug: 27498078
Bug: 22914603
Change-Id: Iee6a784271ec32c6bfcc0a6ad3f0395d82016df3
(cherry picked from commit 3303d909a1c43dec0d99d2c852311cf2171c7c18)

8 years agoRebuild odex files in PDK fusion build.
Ying Wang [Fri, 11 Mar 2016 18:32:01 +0000 (10:32 -0800)]
Rebuild odex files in PDK fusion build.

To rebuild odex files of Java libraries and apps,
we store the jars/apks without stripping the classes.dex inside the
platform.zip. We also save the build variables that may affect how we
rebuild an odex in pdk_dexpreopt_config.mk in the platform.zip.
We store the files and configuration only for libraries/apps that get
installed to the system.img (or vendor.img).

In PDK fusion build, we auto-generate prebuilt module definitions for
the javalib.jar and package.dex.apk carried in the platform.zip, using
configuration stored in pdk_dexpreopt_config.mk.
With the prebult modules, we override the implicit rule that directly
copies the odex from the platform.zip.
To rebuild odex of javalib.jar, we added support for prebuilt shared Java
library to prebiult_internal.mk. An installable prebuilt Java library is
treated as shared Java library, i.e. with classes.dex in the jar instead
of a set of .class files.
For apks in the platform.zip, we install the stripped version from
platform files inside platform.zip, instead of the package.dex.apk,
using a new variable LOCAL_REPLACE_PREBUILT_APK_INSTALLED. We can't
strip package.dex.apk because we can't re-sign the stripped apk at this
point.

We generate prebuilt module only if it's not already defined in the
source tree.

Bug: 27543283
Change-Id: I9e146f8b713d6f57c397fd28d88c9ab700757ca1

8 years agoFix two cosmetic issues in signapk.
Alex Klyubin [Mon, 14 Mar 2016 20:33:26 +0000 (13:33 -0700)]
Fix two cosmetic issues in signapk.

* Zip EoCD record comment length was referred to as 32-bit whereas it
  is a 16-bit field. The implementation was fine, but the comment and
  the naming of a constant were wrong.
* System.out.println was left over from early prototyping days.
  Removed.

Bug: 25794543

(cherry picked from commit 82bf99bb4e4cd4779a08daa21bd4bc2007042f41)

Change-Id: I9845b5fa096859d67b306f4b9b6c205cad622c0c

8 years agoEmulator: Bump arm(64) system image partition size to 1.75 GB
Prathmesh Prabhu [Mon, 14 Mar 2016 18:05:47 +0000 (11:05 -0700)]
Emulator: Bump arm(64) system image partition size to 1.75 GB

Change-Id: If9ce0346ed4ca7ceab3fda217e5c9de6d89b6c94

8 years agoMerge "Revert "build: pass version and patch level to mkbootimg"" into nyc-dev
Sami Tolvanen [Mon, 14 Mar 2016 15:49:15 +0000 (15:49 +0000)]
Merge "Revert "build: pass version and patch level to mkbootimg"" into nyc-dev

8 years agoRevert "build: pass version and patch level to mkbootimg"
Sami Tolvanen [Mon, 14 Mar 2016 15:47:11 +0000 (15:47 +0000)]
Revert "build: pass version and patch level to mkbootimg"

This reverts commit e555f779626faeeddd8d23339241fa6a9240fa28.

Bug: 27580174
Change-Id: I0fd1ddb64d2fd4f91b0ecbc1ab8953a1324a10eb

8 years agoPLATFORM_PREVIEW_SDK_VERSION = 2 for DP2
Ian Pedowitz [Sat, 12 Mar 2016 06:13:36 +0000 (22:13 -0800)]
PLATFORM_PREVIEW_SDK_VERSION = 2 for DP2

Bug: 27150977
Change-Id: I8b86b5565dbdf81dffb4bc9ba0eef8a3c3f91d20

8 years agoSwitch to clang-2658975.
Stephen Hines [Fri, 4 Mar 2016 22:40:56 +0000 (14:40 -0800)]
Switch to clang-2658975.

Bug: http://b/27482631

This fixes an issue where krait compiles were not passing the proper
flags to the assembler when -no-integrated-as is used. This was
preventing ART from switching to clang in some cases.

(cherry picked from commit c503d8ef5826bd1c79dc223ceba614532527a8c9)

Change-Id: I4a0efb78f37fee73bf61841f0347328b8f61c192

8 years agoMerge changes I4a2692f3,Ifd8d3a2c into nyc-dev
Andreas Gampe [Fri, 11 Mar 2016 16:20:50 +0000 (16:20 +0000)]
Merge changes I4a2692f3,Ifd8d3a2c into nyc-dev

* changes:
  Build: Only preopt boot images in eng builds
  Revert "Don't preopt on eng builds."

8 years agoBuild: Only preopt boot images in eng builds
Andreas Gampe [Thu, 10 Mar 2016 23:34:46 +0000 (15:34 -0800)]
Build: Only preopt boot images in eng builds

As a middle way between full preopt/high performance/long builds,
and no preopt/low performance/fast turnaround, preopt only the
boot image in eng builds.

Bug: 26794212
Change-Id: I4a2692f3ce84823cd40c6b7d672fd73257739ef8

8 years agoMerge "change printed version in offline docs to check whether in preview or not...
Scott Main [Thu, 10 Mar 2016 23:12:43 +0000 (23:12 +0000)]
Merge "change printed version in offline docs to check whether in preview or not, and change the title accordingly, using new preview codename or version number." into nyc-dev

8 years agomake image resource URLs relative so they work in offline docs
smain@google.com [Wed, 9 Mar 2016 19:57:39 +0000 (11:57 -0800)]
make image resource URLs relative so they work in offline docs

Change-Id: I4329689d8a3db3ce67f1aa7084a3a4634721e3cb
(cherry picked from commit 7d959be058a2c7fd6e18636dcdf5efd4a0555cb9)

8 years agoRevert "Don't preopt on eng builds."
Andreas Gampe [Thu, 10 Mar 2016 23:07:27 +0000 (15:07 -0800)]
Revert "Don't preopt on eng builds."

This reverts commit 7effde0048bcce6084e00bf29ff3bea4f34d1599.

Bug: 25801231
Bug: 26794212

8 years agochange printed version in offline docs to check whether in preview or not,
smain@google.com [Thu, 10 Mar 2016 22:16:25 +0000 (14:16 -0800)]
change printed version in offline docs to check whether in preview or not,
and change the title accordingly, using new preview codename or version number.

Change-Id: I2833dcd05447add10495fea2149b5a9678831235

8 years agoAdd dependency on boot_singer and vboot_singer if necessary.
Ying Wang [Thu, 10 Mar 2016 20:57:33 +0000 (12:57 -0800)]
Add dependency on boot_singer and vboot_singer if necessary.

Change-Id: Ic10c2ae6a0debf51100a30eb11217e77060a6066

8 years agochange name of offline doc tab to "API reference"
smain@google.com [Wed, 9 Mar 2016 23:36:12 +0000 (15:36 -0800)]
change name of offline doc tab to "API reference"
and put the version number in the secondary nav bar (it was there anyway).

Change-Id: I4b49581eca6afa445a434cd6ae31572d01f276ef
(cherry picked from commit 06bdd78284057b399da728c1cfa1e2238ba84c37)

8 years agoMerge "Make the language version selection smarter" into nyc-dev
Neil Fuller [Thu, 10 Mar 2016 09:45:55 +0000 (09:45 +0000)]
Merge "Make the language version selection smarter" into nyc-dev

8 years agoTurn off excess printing during the build which makes errors harder to find.
Joe Onorato [Wed, 9 Mar 2016 22:48:46 +0000 (14:48 -0800)]
Turn off excess printing during the build which makes errors harder to find.

Change-Id: I588de5ddc0aa7dcaacc4ea185c13c2fa3748888a

8 years agoMerge "Hook incremental ext4 image generation into build" into nyc-dev
Mohamad Ayyash [Wed, 9 Mar 2016 20:56:18 +0000 (20:56 +0000)]
Merge "Hook incremental ext4 image generation into build" into nyc-dev

8 years agoMerge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark." into nyc-dev
Elliott Hughes [Wed, 9 Mar 2016 15:56:50 +0000 (15:56 +0000)]
Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark." into nyc-dev

8 years agoresolve merge conflicts of 2ad8b97577 to nyc-dev
Tao Bao [Wed, 9 Mar 2016 05:39:13 +0000 (21:39 -0800)]
resolve merge conflicts of 2ad8b97577 to nyc-dev

Change-Id: Ifa7501e58dd25e73ed760b1383a1873e4d449885

8 years agoUse the update-binary in the source build for downgrade OTAs. am: fa41fb2705
Tao Bao [Wed, 9 Mar 2016 05:29:30 +0000 (05:29 +0000)]
Use the update-binary in the source build for downgrade OTAs. am: fa41fb2705
am: 7302eb7dd6

* commit '7302eb7dd6bd22c6123bd0b252889732e215592e':
  Use the update-binary in the source build for downgrade OTAs.

8 years agoUse the update-binary in the source build for downgrade OTAs.
Tao Bao [Wed, 9 Mar 2016 05:27:36 +0000 (05:27 +0000)]
Use the update-binary in the source build for downgrade OTAs.
am: fa41fb2705

* commit 'fa41fb27054185b3fba0519d01dabd21444fe772':
  Use the update-binary in the source build for downgrade OTAs.

8 years agoMerge "Install boot.art extra files individually" into nyc-dev
Colin Cross [Wed, 9 Mar 2016 04:45:39 +0000 (04:45 +0000)]
Merge "Install boot.art extra files individually" into nyc-dev

8 years agoreleasetools: Fix the bug in AssertSequenceGood.
Tao Bao [Fri, 4 Mar 2016 23:23:34 +0000 (15:23 -0800)]
releasetools: Fix the bug in AssertSequenceGood.

We use a bitset for blocks in the target image to assert a block hasn't
been touched before reading. Skip checking the blocks that are in the
source image only.

Bug: 27556903
Change-Id: I3a77292da673c813bd20d8dc177ff36419d8ecae
(cherry picked from commit dca2200c8aa09b08ba0d37410a7826b737caecf2)

8 years agoUse the update-binary in the source build for downgrade OTAs.
Tao Bao [Wed, 9 Mar 2016 01:53:39 +0000 (17:53 -0800)]
Use the update-binary in the source build for downgrade OTAs.

We used to use the update-binary from the target build when creating
incremental OTAs. But for downgrade OTAs, we should use the one in the
source build instead, which is actually newer.

Bug: 27556903
Change-Id: Ib6415729b979dbffdebdda24902f7f560942801a
(cherry picked from commit 4996cf03d2321eef56a8163c7fc73ba9976e1021)

8 years agoInstall boot.art extra files individually
Colin Cross [Tue, 8 Mar 2016 21:21:49 +0000 (13:21 -0800)]
Install boot.art extra files individually

The rule that builds boot.art also produces boot.oat, boot-*.art, and
boot-*.oat as a side effect, and the install rule for boot.art was
installing them using *.art and *.oat.  This meant that PDK builds had
no rule to install the extra files, so it used the ones from the
platform.zip file instead of the locally built ones.

Generate a list of the files that should be produced by the boot.art
build, and manually create install rules for them that depend on the
built boot.art and are depended on by the installed boot.art.

Bug: 27546601
Change-Id: I9734491c3179bca2d4b2ae13b0c6a03e4c26b0b2

8 years agoMove BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark.
Elliott Hughes [Fri, 4 Mar 2016 21:37:43 +0000 (13:37 -0800)]
Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark.

Bug: http://b/24803663

(cherry picked from commit 577f8407e915fd278d089968bdafdad171f8c3d1)

Change-Id: If1af37c419abe284677253c33de45dcb5ef6ea8d

8 years agoAdd new templates directory for "reference only" builds.
smain@google.com [Tue, 8 Mar 2016 02:43:21 +0000 (18:43 -0800)]
Add new templates directory for "reference only" builds.
The only difference is that this changes the masthead.cs file to show a different header.

Change-Id: Id58eb7e8c42a8ab0886f2f5da794fcd108f299ff
(cherry picked from commit 5fea5df99cc93dba5388e0f033c2af931ac2cb33)

8 years agobuild: pass version and patch level to mkbootimg
Sami Tolvanen [Fri, 4 Mar 2016 23:41:02 +0000 (15:41 -0800)]
build: pass version and patch level to mkbootimg

Add --os_version and --os_patch_level arguments to mkbootimg.

Needs matching changes from
  I57682611e0c27fec5ed284da7d9a788383ff98b1

Bug: 27498078
Bug: 22914603
Change-Id: I04e20b0de40d864aac92ac7bcf466a6cbde3d0e4
(cherry pick from commit 8fb47f191f804d21e252ef7bb66886ea087c2d56)

8 years agoMake the language version selection smarter
Neil Fuller [Fri, 4 Mar 2016 18:00:00 +0000 (18:00 +0000)]
Make the language version selection smarter

Any artifacts that are targeting SDK versions < 24
and not explicitly setting the LOCAL_JAVA_LANGUAGE_VERSION
are now defaulted to 1.7.

Bug: 27495650
Bug: 26753820
Bug: 27377071
Change-Id: Ia903cd5bf14c1947c485384d095a93c0aa23d272

8 years agoresolve merge conflicts of 08a3a32fa9 to nyc-dev
Tao Bao [Tue, 8 Mar 2016 05:49:33 +0000 (21:49 -0800)]
resolve merge conflicts of 08a3a32fa9 to nyc-dev

Change-Id: I6fd55b3d2bd0c396018163dd4f54970cb55432cd

8 years agoresolve merge conflicts of 177c610e7f to cw-e-dev
Tao Bao [Tue, 8 Mar 2016 05:37:27 +0000 (05:37 +0000)]
resolve merge conflicts of 177c610e7f to cw-e-dev
am: bd25fcdc02

* commit 'bd25fcdc02a94ec9f50fc431a3731484b9812e23':
  DO NOT MERGE releasetools: Support generating downgrade incremental OTAs.

8 years agoresolve merge conflicts of 177c610e7f to cw-e-dev
Tao Bao [Tue, 8 Mar 2016 05:24:40 +0000 (21:24 -0800)]
resolve merge conflicts of 177c610e7f to cw-e-dev

Change-Id: Iba7820247d0b53d7f9553290eb0db3547f31beda

8 years agoDO NOT MERGE releasetools: Support generating downgrade incremental OTAs.
Tao Bao [Tue, 23 Feb 2016 19:38:39 +0000 (11:38 -0800)]
DO NOT MERGE releasetools: Support generating downgrade incremental OTAs.

Add --downgrade flag to ota_from_target_files.py script. It allows
generating an incremental OTA that updates from a newer build to an
older one (based on timestamp comparison). "post-timestamp" line in the
metadata file will be replaced by "ota-downgrade=yes". A data wipe will
always be enforced, so "ota-wipe=yes" will also be included in the
metadata file.

Bug: 26883782
Change-Id: Iaa05f662d948b7ab632a9fbb7051cc3f8bf68c21
(cherry picked from commit 5d1825664a0fec256fa28d62aadcac96f59a41b2)

8 years agoEnable LOCAL_POST_LINK_CMD for non-static executables.
Yabin Cui [Wed, 2 Mar 2016 22:03:41 +0000 (14:03 -0800)]
Enable LOCAL_POST_LINK_CMD for non-static executables.

It is needed to insert testdata section into simpleperf cts test.

Bug: 27387280
Change-Id: I58cea106d135f535626d8624a016bd2aaceeb8ea
(cherry picked from commit 273e9109c1cefb760d96b8707d75704d733cc38b)

8 years agoFix dumping variables of absolute paths.
Ying Wang [Mon, 7 Mar 2016 19:27:20 +0000 (11:27 -0800)]
Fix dumping variables of absolute paths.

Calling $(abspath) is better than checking and prepending $(PWD) if
necessary.

Bug: 27429759
Change-Id: Ia156f8a5d6b88b6090f4d23c7f9166bd62d3ab70
(cherry-pick from commit 80ceadc94526d6c48c0022bf25281bb522914a3d)

8 years agoSupport build old version of cts
Julien Desprez [Sat, 5 Mar 2016 12:05:49 +0000 (12:05 +0000)]
Support build old version of cts

Bug: 27508747
Change-Id: I3d474f6f6534e172ecf1d0a6c833a9dfa6164344

8 years agoMerge "emulator: Add a product packages overlay." into nyc-dev
Prathmesh Prabhu [Fri, 4 Mar 2016 23:49:07 +0000 (23:49 +0000)]
Merge "emulator: Add a product packages overlay." into nyc-dev

8 years agoSmall fixes.
Ying Wang [Fri, 4 Mar 2016 21:56:23 +0000 (13:56 -0800)]
Small fixes.

Change-Id: Ia949ed0bc93edb78d0b029f3bd3dd584e9a00dc8
(cherry-pick from commit f0cb397a9e204c86be7730f94ae5fba84d88f89a)

8 years agoSpeed up lunch/tapas/etc. shell utility functions.
Ying Wang [Fri, 4 Mar 2016 04:57:21 +0000 (20:57 -0800)]
Speed up lunch/tapas/etc. shell utility functions.

1. Combined ~10 calls to the make build system to only one.
   We added a phony target "dump-many-vars" to the build system to dump
   "<var>=<value>" pairs. We then store the pairs as shell variables.
   With this cache get_build_var/get_abs_build_var can just return
   the shell variables instead of querying the build system.
2. Prune .git when we search for AndroidProduct.mks.

In internal source tree lunch time was reduced from ~15s to ~1.5s.

Bug: 27429759

(cherry picked from commit 08800fd905e70faf01d9392d00ff3f49d99097b7)

Change-Id: I862a0ec3c1aae97c552054dacec133e857042edf

8 years agoemulator: Add a product packages overlay.
Prathmesh Prabhu [Fri, 4 Mar 2016 21:43:04 +0000 (13:43 -0800)]
emulator: Add a product packages overlay.

Emulator is a product, so add an overlay that allows us to override some
stock android resources.

BUG: 27484734
Change-Id: I1b651316a14f6d5c79651813ad13302b67507cae

8 years agoAlign up java-lib-files and java-lib-deps.
Ying Wang [Thu, 3 Mar 2016 01:25:01 +0000 (17:25 -0800)]
Align up java-lib-files and java-lib-deps.

- For host Java libraries, java-lib-files should return javalib.jar.
- Host dalvik Java libraries are special: factor out
  host-dex-java-lib-files.
- Be explict that jack-lib-deps equals jack-lib-files.

Bug: 27451686
Change-Id: I9235384354e119ef7ebbf29b7e525d1ceea242e0

8 years agoHook incremental ext4 image generation into build
Mohamad Ayyash [Thu, 3 Mar 2016 05:07:23 +0000 (21:07 -0800)]
Hook incremental ext4 image generation into build

Allows passing the *.base_fs or *.map files for system and vendor in
INTERNAL_SYSTEM_BASE_FS_PATH and INTERNAL_VENDOR_BASE_FS_PATH variables
respectively.

Internal Design Doc: go/incremental-ext4
BUG: 26839493
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Change-Id: Ie57ef6dbfa6084268b6535fe0a673a3b4aaa6e2f
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
8 years agoMerge "Add --auto-add-overlay if a module has LOCAL_STATIC_ANDROID_LIBRARIES" into...
Ying Wang [Thu, 3 Mar 2016 18:09:31 +0000 (18:09 +0000)]
Merge "Add --auto-add-overlay if a module has LOCAL_STATIC_ANDROID_LIBRARIES" into nyc-dev

8 years agoMerge "[DO NOT MERGE] Update BUILD_ID for nyc branches." into nyc-dev
Ying Wang [Thu, 3 Mar 2016 17:34:59 +0000 (17:34 +0000)]
Merge "[DO NOT MERGE] Update BUILD_ID for nyc branches." into nyc-dev

8 years agoMerge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY" into nyc-dev
Neil Fuller [Thu, 3 Mar 2016 09:11:07 +0000 (09:11 +0000)]
Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY" into nyc-dev

8 years agoMerge "Use Jack to check build" into nyc-dev
Yohann Roussel [Thu, 3 Mar 2016 08:47:41 +0000 (08:47 +0000)]
Merge "Use Jack to check build" into nyc-dev

8 years agoAdd --auto-add-overlay if a module has LOCAL_STATIC_ANDROID_LIBRARIES
Ying Wang [Thu, 3 Mar 2016 02:55:46 +0000 (18:55 -0800)]
Add --auto-add-overlay if a module has LOCAL_STATIC_ANDROID_LIBRARIES

Bug: 25958912
Change-Id: Iafba9eefde0823095775474bcb7cc5b6c21fd248

8 years ago[DO NOT MERGE] Update BUILD_ID for nyc branches.
Ying Wang [Thu, 3 Mar 2016 02:00:19 +0000 (18:00 -0800)]
[DO NOT MERGE] Update BUILD_ID for nyc branches.

Bug: 27327323
Change-Id: I60985c66a41cbece69f0a19c19bde7695b2ca48e

8 years agoMerge "Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES...
Ying Wang [Thu, 3 Mar 2016 00:55:24 +0000 (00:55 +0000)]
Merge "Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES" into nyc-dev

8 years agoMerge "Clean generated source dir if .proto/.rs is gonee." into nyc-dev
Ying Wang [Wed, 2 Mar 2016 18:19:25 +0000 (18:19 +0000)]
Merge "Clean generated source dir if .proto/.rs is gonee." into nyc-dev

8 years agoMerge "Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCAT...
Ying Wang [Wed, 2 Mar 2016 18:03:30 +0000 (18:03 +0000)]
Merge "Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS" into nyc-dev

8 years agoAdd cts_v2 phony target for temporary build fix.
Stuart Scott [Wed, 2 Mar 2016 16:42:41 +0000 (08:42 -0800)]
Add cts_v2 phony target for temporary build fix.

Change-Id: I770dc800dbcdff2c31e370410b32e2ee079f308b

8 years agoAdd JarJar support to BUILD_HOST_JAVA_LIBRARY
Neil Fuller [Wed, 2 Mar 2016 11:19:41 +0000 (11:19 +0000)]
Add JarJar support to BUILD_HOST_JAVA_LIBRARY

This will allow us to convert icu4j-icudata / icu4j-icutzdata
targets to "host" targets rather than "target" targets.
Right now they are forcing Jack off just so they can use
javac + jarjar (even though the resulting file is used on
host).

Bug: 27218410
Change-Id: I7062c698389d98b0dde5690280a9140c3b12cbf7

8 years agoClean generated source dir if .proto/.rs is gonee.
Ying Wang [Wed, 2 Mar 2016 06:05:25 +0000 (22:05 -0800)]
Clean generated source dir if .proto/.rs is gonee.

Similar to how we clean the generated source dir if .aidl becomes
obsolete.

Bug: 26688474
Change-Id: I66c5b6d6513259b5f4f4bac84f384f4bf953d82a

8 years agoSupport arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS
Ying Wang [Wed, 2 Mar 2016 04:14:52 +0000 (20:14 -0800)]
Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS

So that we can disable only one in multilib modules.

Bug: 27442756
Change-Id: I4ca379fac997f9165c47cb93d34bf1f483f5a241

8 years agoresolve merge conflicts of 9baa993c07 to nyc-dev
Tao Bao [Tue, 1 Mar 2016 23:08:51 +0000 (15:08 -0800)]
resolve merge conflicts of 9baa993c07 to nyc-dev

Change-Id: Ifcfb2da03662ef1b6677c0974605189e2a8e3d20

8 years agoreleasetools: Add --oem_no_mount option.
Tao Bao [Tue, 1 Mar 2016 22:56:23 +0000 (22:56 +0000)]
releasetools: Add --oem_no_mount option.
am: df4cb0b2c1

* commit 'df4cb0b2c1e6d1cf5973e9008bd6dc15bd590ac0':
  releasetools: Add --oem_no_mount option.

8 years agoMerge changes I769ed278,I99cb69ea,I57bcbed0,I6e51e51f,Iab2d36e2 into nyc-dev
Stephen Hines [Tue, 1 Mar 2016 21:36:15 +0000 (21:36 +0000)]
Merge changes I769ed278,I99cb69ea,I57bcbed0,I6e51e51f,Iab2d36e2 into nyc-dev

* changes:
  Remove debug statement
  Tell Soong about HOST_CROSS_*
  Update to use the latest clang-2629532.
  Use newest clang static analyzers.
  Add 64-bit windows cross-compiles

8 years agoCalls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES
Ying Wang [Tue, 1 Mar 2016 20:06:47 +0000 (12:06 -0800)]
Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES

We expect to build the module's own packare-res.apk from the
LOCAL_STATIC_ANDROID_LIBRARIES in this case.

Bug: 25958912
Change-Id: I4d0294c867f5fb636983d630493a3b188279cae9

8 years agoMerge "Add options for dynamic linker developer warnings" into nyc-dev
Dimitry Ivanov [Tue, 1 Mar 2016 17:50:00 +0000 (17:50 +0000)]
Merge "Add options for dynamic linker developer warnings" into nyc-dev

8 years agoMerge "AAPT2: Enable product/config filtering and improve source ordering" into nyc-dev
Adam Lesinski [Tue, 1 Mar 2016 17:49:04 +0000 (17:49 +0000)]
Merge "AAPT2: Enable product/config filtering and improve source ordering" into nyc-dev

8 years agoUse Jack to check build
Yohann Roussel [Tue, 18 Aug 2015 17:18:18 +0000 (19:18 +0200)]
Use Jack to check build

Run jack with no outputs as a quick check for compilation errors and use
a timestamp to store that check was made.

Bug: 19069325

(cherry picked from commit 43084d9f49a994a7eaebd3c94758d0ebf4c74b6e)

Change-Id: I9b84b503b28cfdfa245f91da0061ee3a79386b28

8 years agoSwitch to CTSv2
Stuart Scott [Fri, 19 Feb 2016 19:15:15 +0000 (11:15 -0800)]
Switch to CTSv2

bug:21762834
Change-Id: If91fd4de148241760ff29cbe227864e301a9fca7

8 years agoRemove debug statement
Dan Willemsen [Wed, 10 Feb 2016 22:39:27 +0000 (14:39 -0800)]
Remove debug statement

(cherry picked from commit dbf07922796a6df84221e482aefd05f82a95d9e7)

Change-Id: I769ed278012d3b77f6446c24787ea8d3fe29861a

8 years agoTell Soong about HOST_CROSS_*
Dan Willemsen [Tue, 9 Feb 2016 22:55:13 +0000 (14:55 -0800)]
Tell Soong about HOST_CROSS_*

This configures Soong to build windows binaries, which requires support
for 64-bit windows binaries in BUILD_PREBUILT for USE_SOONG=true.

module_arch_supported.mk did not support 64-bit being the secondary
architecture when evaluating multilib conditionals. All other uses of
HOST_*_IS_64_BIT already check the proper version.

(cherry picked from commit d6e3b841850d9a607eb9c841d9fa1836feedee5f)

Change-Id: I99cb69ea1756b8258f15d3630c75c9ffe277aaef

8 years agodelete recovery policy on changing build types
Nick Kralevich [Sat, 27 Feb 2016 18:41:41 +0000 (10:41 -0800)]
delete recovery policy on changing build types

When the build type changes (for example, from "shamu-userdebug"
to "shamu-user"), the build system doesn't delete all files
and start over. Rather, build artifacts from the old build type
are reused for the new build type.

This is problematic for the recovery SELinux policy, which differs
between build types. Reusing a userdebug policy on a user build
is inappropriate and could lead to security bugs.

Force the deletion of the recovery SELinux policy when changing
build types, so it can be properly regenerated. This is consistent
with how we treat the normal SELinux policy (see commit
a8b3d54101eccb9950651103c199edf0ce2520f7).

(cherry picked from commit 3cb10bbd3b376aecbbefffbe4d43105665bad345)

Change-Id: I1d8ad7e06112777c66abed4546dadb85d35e33e1

8 years agoAdd options for dynamic linker developer warnings
Dimitry Ivanov [Sat, 27 Feb 2016 00:24:26 +0000 (16:24 -0800)]
Add options for dynamic linker developer warnings

Add bionic options that enable developer warnings for
beta/preview builds.

Bug: http://b/27365747
Change-Id: Ifc2ab706975558824522da5eece186e1660969ad

8 years agoUpdate to use the latest clang-2629532.
Stephen Hines [Wed, 24 Feb 2016 05:58:06 +0000 (21:58 -0800)]
Update to use the latest clang-2629532.

Bug: http://b/25642296

(cherry picked from commit 352bccb65ec94a5cb48a31c5b3713b96b2edae9f)

Change-Id: I57bcbed0d7d51864ba7d7325334e9bbbba9f847b

8 years agoUse newest clang static analyzers.
Chih-Hung Hsieh [Tue, 2 Feb 2016 19:30:39 +0000 (11:30 -0800)]
Use newest clang static analyzers.

* When WITH_STATIC_ANALYZER is set and non-zero, and clang compiler is used,
  call new clang ccc-analyzer or c++-analyzer.
* Otherwise, if WITH_SYNTAX_CHECK is set and non-zero,
  call compiler with -fsyntax-only.
* Replace "--sysroot=path" with "--sysroot path", to work with ccc-analyzer.
* ccc-analyzer executes the original compilation command to generate
  object files before calling clang with --analyze to do static analysis.
* When clang is called with --analyze, macro __clang_analyzer__ is defined.

BUG: 13287788

(cherry picked from commit 765c1ea6d7272fae04d435b9bac79087a2f6aabf)

Change-Id: I6e51e51ff4ed3ce514f60d090494dcdf6e520b04

8 years agoAdd 64-bit windows cross-compiles
Dan Willemsen [Sat, 6 Feb 2016 00:20:19 +0000 (16:20 -0800)]
Add 64-bit windows cross-compiles

This is mostly the same as the existing 2ND_HOST / HOST_CROSS support.

The interesting thing I did here was make x86 the 'first' architecture,
and x86_64 the second. This way LOCAL_MULTILIB := first defaults to
32-bit windows modules.

  windows-x86/bin   <- defaults to 32-bit executables
  windows-x86/lib   <- 32-bit libraries, like before
  windows-x86/lib64 <- 64-bit libraries
  windows-x86/obj   <- 32-bit intermediates
  windows-x86/obj64 <- 64-bit intermediates

Then modules are registered with the names:

  host_cross_liblog    <- 32-bit, like before
  host_cross_liblog_64 <- 64-bit

Bug: 26957718

(cherry picked from commit 9ecbf832593980facba06c9031b8539b9cfdfd26)

Change-Id: Iab2d36e20d7002568c3534e7781e9ac8ab21a4a9

8 years agoAAPT2: Enable product/config filtering and improve source ordering
Adam Lesinski [Fri, 26 Feb 2016 19:13:43 +0000 (11:13 -0800)]
AAPT2: Enable product/config filtering and improve source ordering

- Restore old ordering of resource files to match AAPT behavior
- Change the order in which overlays are processed.

Change-Id: I9da88f6b4124e7f89a70eb485b4591d5c4c87d38

8 years agoreleasetools: Add --oem_no_mount option.
Tao Bao [Fri, 26 Feb 2016 03:49:55 +0000 (19:49 -0800)]
releasetools: Add --oem_no_mount option.

We may have devices with OEM-specific properties but without an OEM
partition (e.g. the properties might be set by init based on hardware
SKUs). For such devices, we supply --oem_no_mount to skip mounting the
OEM partition in the updater-script. The option is only meaningful when
-o (--oem_settings) is specified.

Bug: 27359929
Change-Id: Ic08396e478a82be4188e980e704b33b4f704a8d7
(cherry picked from commit 8608cde944d64dece63e8c770deb78c1d092c719)

8 years agoMerge "AAPT2: library resource compilation" into nyc-dev
Ying Wang [Fri, 26 Feb 2016 22:58:12 +0000 (22:58 +0000)]
Merge "AAPT2: library resource compilation" into nyc-dev

8 years ago[Emulator] Add comment about including AOSP messaging on AOSP images.
Prathmesh Prabhu [Fri, 26 Feb 2016 19:17:20 +0000 (11:17 -0800)]
[Emulator] Add comment about including AOSP messaging on AOSP images.

We've gone back and forth on this a few times.
Just state clearly why we're including the AOSP messaging APP here.

BUG:22097835
Change-Id: I26864ba033f0a211d038fa3526241c869d677217

8 years agoMerge "build file change for vts to use the existing cts-tradefed infrastructure...
Keun Soo Yim [Fri, 26 Feb 2016 19:24:09 +0000 (19:24 +0000)]
Merge "build file change for vts to use the existing cts-tradefed infrastructure" into nyc-dev

8 years agoAAPT2: library resource compilation
Ying Wang [Wed, 24 Feb 2016 22:11:55 +0000 (14:11 -0800)]
AAPT2: library resource compilation

- Switch to static library's package-res.apk as the link artifact.
- For prebuilt AAR file, build package-res.apk using aapt2's "--dir"
  option.
- New LOCAL variables:
  LOCAL_USE_AAPT2: a module can opt-in with "LOCAL_USE_AAPT2 := true".
  LOCAL_STATIC_ANDROID_LIBRARIES: static Java libraries with compiled
                   resources.
  LOCAL_SHARED_ANDROID_LIBRARIES: shared Java libraries with compiled
                   resources.

Bug: 25958912
Change-Id: I4be2d1e8137555986338c2583cb39b0c97391751

8 years agoRemove dhcpcd from the base target makefile.
Lorenzo Colitti [Thu, 25 Feb 2016 06:50:28 +0000 (15:50 +0900)]
Remove dhcpcd from the base target makefile.

Bug: 27192644
Change-Id: Iacac58e05c441dd267c7f09f91dbfcb94f54167c

8 years agoreleasetools: Support generating downgrade incremental OTAs.
Tao Bao [Tue, 23 Feb 2016 19:38:39 +0000 (11:38 -0800)]
releasetools: Support generating downgrade incremental OTAs.

Add --downgrade flag to ota_from_target_files.py script. It allows
generating an incremental OTA that updates from a newer build to an
older one (based on timestamp comparison). "post-timestamp" line in the
metadata file will be replaced by "ota-downgrade=yes". A data wipe will
always be enforced, so "ota-wipe=yes" will also be included in the
metadata file.

Bug: 26883782
Change-Id: Iaa05f662d948b7ab632a9fbb7051cc3f8bf68c21
(cherry picked from commit 5d1825664a0fec256fa28d62aadcac96f59a41b2)

8 years agobuild file change for vts to use the existing cts-tradefed infrastructure
Keun Soo Yim [Wed, 24 Feb 2016 23:41:01 +0000 (15:41 -0800)]
build file change for vts to use the existing cts-tradefed infrastructure

Mostly done by stuartscott@

Change-Id: I016405757f39df833d532bc01fd2237e5e961a8a

8 years agoMerge "Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE" into nyc-dev
Alex Light [Wed, 24 Feb 2016 23:34:06 +0000 (23:34 +0000)]
Merge "Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE" into nyc-dev

8 years agoMark the cortex-{a7,a53,a53.57} chips as supporting LPAE
Alex Light [Wed, 24 Feb 2016 21:08:58 +0000 (13:08 -0800)]
Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE

(cherry picked from commit bdfeb3e760feb080b449cc58129e5473bda54dec)

Bug: 27340895
Bug: 27324856

Change-Id: Id3994c6d334c8bb673fc3849550f591136a8dd6a

8 years agoMerge "Warn more clearly when there are duplicate copied headers" into nyc-dev
Dan Willemsen [Wed, 24 Feb 2016 18:31:42 +0000 (18:31 +0000)]
Merge "Warn more clearly when there are duplicate copied headers" into nyc-dev

8 years agoMerge "Revert "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1...
Neil Fuller [Wed, 24 Feb 2016 10:15:14 +0000 (10:15 +0000)]
Merge "Revert "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8""" into nyc-dev

8 years agoAllow to build against Mac OS X SDK 10.11. am: 7f7c698959 am: 773b017ee9 am: e511a07677
Ying Wang [Wed, 24 Feb 2016 05:49:25 +0000 (05:49 +0000)]
Allow to build against Mac OS X SDK 10.11. am: 7f7c698959 am: 773b017ee9 am: e511a07677
am: 6a95943887

* commit '6a95943887c1ad35bcd059119ac506741c172048':
  Allow to build against Mac OS X SDK 10.11.

8 years agoUpdate mac_sdk_versions_supported. am: 8df3355f64 am: 0954a9d91f am: 2114b48a14
Ying Wang [Wed, 24 Feb 2016 05:49:13 +0000 (05:49 +0000)]
Update mac_sdk_versions_supported. am: 8df3355f64 am: 0954a9d91f am: 2114b48a14
am: 938722577b  -s ours

* commit '938722577bb7005dd321534ca29de2ccf71869e7':
  Update mac_sdk_versions_supported.

8 years agoAllow to build against Mac OS X SDK 10.11. am: 7f7c698959 am: 773b017ee9
Ying Wang [Wed, 24 Feb 2016 03:01:39 +0000 (03:01 +0000)]
Allow to build against Mac OS X SDK 10.11. am: 7f7c698959 am: 773b017ee9
am: e511a07677

* commit 'e511a07677dfc8f622f5fa8863b453aad7ffcdea':
  Allow to build against Mac OS X SDK 10.11.

8 years agoUpdate mac_sdk_versions_supported. am: 8df3355f64 am: 0954a9d91f
Ying Wang [Wed, 24 Feb 2016 03:01:22 +0000 (03:01 +0000)]
Update mac_sdk_versions_supported. am: 8df3355f64 am: 0954a9d91f
am: 2114b48a14

* commit '2114b48a14c6108d2d4d3207c2eb87d2d72ab76d':
  Update mac_sdk_versions_supported.

8 years agoAllow to build against Mac OS X SDK 10.11. am: 7f7c698959
Ying Wang [Wed, 24 Feb 2016 02:55:16 +0000 (02:55 +0000)]
Allow to build against Mac OS X SDK 10.11. am: 7f7c698959
am: 773b017ee9

* commit '773b017ee96ace4e4bdc176dd59fc14c979736ef':
  Allow to build against Mac OS X SDK 10.11.

8 years agoUpdate mac_sdk_versions_supported. am: 8df3355f64
Ying Wang [Wed, 24 Feb 2016 02:54:51 +0000 (02:54 +0000)]
Update mac_sdk_versions_supported. am: 8df3355f64
am: 0954a9d91f

* commit '0954a9d91f8f68133150a39afc364e1ad091a19b':
  Update mac_sdk_versions_supported.

8 years agoAllow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 24 Feb 2016 02:46:46 +0000 (02:46 +0000)]
Allow to build against Mac OS X SDK 10.11.
am: 7f7c698959

* commit '7f7c6989590bd9395e8ebf3a01b5b4033c89d7d1':
  Allow to build against Mac OS X SDK 10.11.

8 years agoUpdate mac_sdk_versions_supported.
Ying Wang [Wed, 24 Feb 2016 02:46:36 +0000 (02:46 +0000)]
Update mac_sdk_versions_supported.
am: 8df3355f64

* commit '8df3355f64119adb9ca71c9f2cc9b51afb61c65a':
  Update mac_sdk_versions_supported.

8 years agoAllow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 14 Oct 2015 01:00:45 +0000 (18:00 -0700)]
Allow to build against Mac OS X SDK 10.11.

Bug: 24739158
Change-Id: I7c57e141dd02a0d2de5a7a1ccbc72ffe422a8d6f

8 years agoUpdate mac_sdk_versions_supported.
Ying Wang [Wed, 29 Jul 2015 23:35:40 +0000 (16:35 -0700)]
Update mac_sdk_versions_supported.

Now we requires Mac OS X SDK version at least 10.8.
Also removed the unnecessary sort call in getting
mac_sdk_versions_installed.
Lexical sort doesn't make sense when 10.10 is added to that list.
Actually the next makefile line makes sure we always get the first
match in $(mac_sdk_versions_supported):
mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed),
$(mac_sdk_versions_supported)))

Bug: 22825165
Change-Id: I4bfafabb11f94b66704d4799fe61fe3f16429538