OSDN Git Service

android-x86/build.git
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 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

8 years agoEmulator: Add fingerprint permission to sdk system images
bohu [Wed, 24 Feb 2016 00:28:26 +0000 (16:28 -0800)]
Emulator: Add fingerprint permission to sdk system images

Since N, the android.hardware.fingerprint.xml is required.
bug: 27324642

Change-Id: Ib2f77f68bb4b9a68e1e77311fae3ce2a30bc37cb

8 years agoWarn more clearly when there are duplicate copied headers
Dan Willemsen [Tue, 23 Feb 2016 21:40:07 +0000 (13:40 -0800)]
Warn more clearly when there are duplicate copied headers

When more than one makefile tries to copy a header to the same
destination, the warning is not clear, and hard to track down and assign
blame:

build/core/copy_headers.mk:15: warning: ignoring old commands for target `out/target/product/bullhead/obj/include/qcom/display/copybit.h'

With this change, the same behavior is kept, but the warning message is
more descriptive, and contains the offending Android.mk files:

build/core/Makefile:54: Duplicate header copy: out/target/product/bullhead/obj/include/qcom/display/copybit.h
build/core/Makefile:54: Defined in: hardware/qcom/display/msm8994/libcopybit/Android.mk hardware/qcom/display/msm8994/libcopybit/Android.mk

In this case, a $(CLEAR_VARS) is missing, so the same Android.mk file is
copying the same headers twice.

Bug: 27302058
Change-Id: Icf8f580ae71a78741db21c1d8f3213424459e637
(cherry picked from commit 6f60f020d781d9a93786616039323e9f25e02c0b)

8 years agoMerge "emulator: allows surfaceflinger to change qemu.gles value" into nyc-dev
Bo Hu [Tue, 23 Feb 2016 21:46:31 +0000 (21:46 +0000)]
Merge "emulator: allows surfaceflinger to change qemu.gles value" into nyc-dev

8 years agoGeneric x86_64: Bump system image partition size to 1.75 GB.
Prathmesh Prabhu [Tue, 23 Feb 2016 20:32:28 +0000 (12:32 -0800)]
Generic x86_64: Bump system image partition size to 1.75 GB.

BUG=b.android.com/201662

Change-Id: I3b13082d73a3e1c9f49cb9158d2423dc580a8c75

8 years agoMake sure my_src_jar is set up properly for host prebuilt jar
Ying Wang [Mon, 22 Feb 2016 23:54:27 +0000 (15:54 -0800)]
Make sure my_src_jar is set up properly for host prebuilt jar

Make sure my_src_jar is set up properly for host prebuilt jar when we
need to generate host .jack for host dalvik java libraries.

(cherry picked from commit 86e74b96fcc46d6d6c3758b13cca755c12e7de8a)

Change-Id: I79393bc416fafb6d9cd28b12070a58ae5731587d

8 years agoRevert "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8""
Neil Fuller [Tue, 23 Feb 2016 11:17:32 +0000 (11:17 +0000)]
Revert "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8""

This reverts commit 799d603029701fd565538ed7d09be3cdf34dded9.

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

8 years agoRevert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8"
Neil Fuller [Tue, 23 Feb 2016 10:18:42 +0000 (10:18 +0000)]
Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8"

Reverting: broke the messaging app due to a recent change
there (commit 280a2fbe41f24eed11fcf5e13b803de17525b261).

This reverts commit dfcd9124880528a7bfbf9ba361b1a2040035ca06.

Change-Id: I055f35c0a7400ab2887c91d017eebaed1adaf972

8 years agoMerge "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8" into nyc-dev
Neil Fuller [Tue, 23 Feb 2016 09:47:35 +0000 (09:47 +0000)]
Merge "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8" into nyc-dev

8 years agoClear logd intermediates
Sami Tolvanen [Wed, 10 Feb 2016 18:41:26 +0000 (10:41 -0800)]
Clear logd intermediates

Needed by changes from
  Idcdc5bff133f13c1267f0ec0a75cc8cf1ddbda0d

Bug: 26902605
Change-Id: Id3ca7889ede30b54b7af73dd50653ca1a20d59aa
(cherry picked from commit d7da0ffb20a421a5c9c90084b30e8f665d165f5b)

8 years agoMerge "Add support for testing obfuscated app with Jack" into nyc-dev
Yohann Roussel [Mon, 22 Feb 2016 13:04:51 +0000 (13:04 +0000)]
Merge "Add support for testing obfuscated app with Jack" into nyc-dev

8 years agoMerge "Add profman to the build scripts" into nyc-dev
Calin Juravle [Mon, 22 Feb 2016 11:41:59 +0000 (11:41 +0000)]
Merge "Add profman to the build scripts" into nyc-dev

8 years agoAdd support for testing obfuscated app with Jack
Yohann Roussel [Tue, 3 Nov 2015 17:33:21 +0000 (18:33 +0100)]
Add support for testing obfuscated app with Jack

Bug: 17481317
Bug: 27215871
Bug: 27215868

(cherry picked from commit 505dafb03bdbd9351b5eb8565ac4d8195592ff9a)

Change-Id: Ia12fb92585cfcc595eef6cd096d27e779e596f7d

8 years agoemulator: allows surfaceflinger to change qemu.gles value
bohu [Sat, 20 Feb 2016 01:20:32 +0000 (17:20 -0800)]
emulator: allows surfaceflinger to change qemu.gles value

This is to allow surfaceflinger to always load vendor provided
egl libraries first and fall back to software renderer, and then
set the qemu.gles to correct value reflecting what libraries
are actually used.

bug: 27273457

Change-Id: Ifaca31aa2e562f50baa41fd228df9836bc3b1667

8 years agoMerge "Allow smooth upgrade of AVD's from older API's." into nyc-dev
Prathmesh Prabhu [Sat, 20 Feb 2016 01:02:03 +0000 (01:02 +0000)]
Merge "Allow smooth upgrade of AVD's from older API's." into nyc-dev

8 years agoAllow smooth upgrade of AVD's from older API's.
Lingfeng Yang [Fri, 5 Feb 2016 18:40:21 +0000 (10:40 -0800)]
Allow smooth upgrade of AVD's from older API's.

If we are using an old API for the emulator
(API 19 for example) and then upgrade the AVD
to API 23 through the AVD settings, we get a bunch
of crashes in the TelephonyProvider,
as it is looking for a file that does not exist
that concerns upgrading from old "apn"'s.

This CL adds this file to the files to be copied
to /etc in the system image.

BUG: b.android.com/200390
BUG=27273457

RELEASE NOTE: Fixed telephony service crashes on startup when upgrading from an old API.

Change-Id: I227713880bf20541c759aab588c00197ac7aebfd
(cherry picked from commit e5083159401edf1df5109b56d1aedbbb739584e6)

8 years agoExplicitly use messaging app in SDK phone builds
Bjoern Johansson [Wed, 18 Nov 2015 18:04:21 +0000 (10:04 -0800)]
Explicitly use messaging app in SDK phone builds

This change explicitly includes only the messaging app instead of all of
aosp_base_telephony. This fixes the issue where on initial boot the user
was prompted to select a Home app. This happened because the
aosp_base_telephony makefile includes other makefiles that in turn add
the package Provision which has an activity with an intent filter for
handling HOME. SdkSetup already had such an activity so with two choices
it was left to the user to decide which one to use.

BUG=27273457

Change-Id: I42e77b892ce235a5fa858561325ae37973cfb0cd
(cherry picked from commit 12de252f451b34cfa67f7256027dad84dcfd984d)

8 years agoUpdating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a16...
Zach Jang [Fri, 19 Feb 2016 22:34:03 +0000 (22:34 +0000)]
Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8 am: eb651e2e45 am: 3f53b385de am: fc30358acb
am: c4d9b64a68

* commit 'c4d9b64a686dbfbc8e2f91d96203a7328249f5dd':
  Updating security string patch to 2016-04-01

8 years agoUpdating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a16...
Zach Jang [Fri, 19 Feb 2016 22:28:35 +0000 (22:28 +0000)]
Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8 am: eb651e2e45 am: 3f53b385de
am: fc30358acb

* commit 'fc30358acbfaa41e2c3282832ceb3607a0c2fcb9':
  Updating security string patch to 2016-04-01

8 years agoUpdating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a16...
Zach Jang [Fri, 19 Feb 2016 22:22:57 +0000 (22:22 +0000)]
Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8 am: eb651e2e45
am: 3f53b385de

* commit '3f53b385dec6b45d0e4d07a29ce43b3c510b1d10':
  Updating security string patch to 2016-04-01

8 years agoUpdating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8
Zach Jang [Fri, 19 Feb 2016 22:17:28 +0000 (22:17 +0000)]
Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8
am: eb651e2e45

* commit 'eb651e2e450f1756e6acea4f570379af7d146920':
  Updating security string patch to 2016-04-01

8 years agoUpdating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766
Zach Jang [Fri, 19 Feb 2016 22:11:32 +0000 (22:11 +0000)]
Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766
am: 7e6a1633c8

* commit '7e6a1633c8ebb622271020cbb0aedae355e6501a':
  Updating security string patch to 2016-04-01

8 years agoUpdating security string patch to 2016-04-01 am: e182d2a95c
Zach Jang [Fri, 19 Feb 2016 22:06:14 +0000 (22:06 +0000)]
Updating security string patch to 2016-04-01 am: e182d2a95c
am: 054bbb9766

* commit '054bbb9766312a2caefd5375341d49074a6d25bf':
  Updating security string patch to 2016-04-01

8 years agoUpdating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:00:21 +0000 (22:00 +0000)]
Updating security string patch to 2016-04-01
am: e182d2a95c

* commit 'e182d2a95c52e37d2a6f924c8ff386b52b08a0c9':
  Updating security string patch to 2016-04-01

8 years agoUpdating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 21:50:29 +0000 (13:50 -0800)]
Updating security string patch to 2016-04-01

b/27272697

Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e

8 years agoAdd profman to the build scripts
Calin Juravle [Fri, 19 Feb 2016 16:54:20 +0000 (16:54 +0000)]
Add profman to the build scripts

Bug: 26719109
Bug: 26563023
Change-Id: I91e4baa0102362035d9a73dcfd5bc4645906aae1

8 years agoLabel ranchu block devices.
dcashman [Thu, 18 Feb 2016 22:07:44 +0000 (14:07 -0800)]
Label ranchu block devices.

Address the following denials:
avc:  denied  { getattr } for  pid=1166 comm="e2fsck" path="/dev/block/vdc" dev="tmpfs" ino=2880 scontext=u:r:fsck:s0 tcontext=u:object_r:block_device:s0 tclass=blk_file permissive=0
avc:  denied  { read write } for  pid=1166 comm="e2fsck" name="vdc" dev="tmpfs" ino=2880 scontext=u:r:fsck:s0 tcontext=u:object_r:block_device:s0 tclass=blk_file permissive=0

Bug: 27224003
Change-Id: I4792420822d238e6ad1bf757634c924b95150515

8 years agoMerge "Define a class for renderscript bitcode files" into nyc-dev
Stephen Hines [Fri, 19 Feb 2016 03:35:15 +0000 (03:35 +0000)]
Merge "Define a class for renderscript bitcode files" into nyc-dev

8 years agoRevert "emulator.mk: Add ethernet permission"
bohu [Tue, 1 Dec 2015 19:19:03 +0000 (11:19 -0800)]
Revert "emulator.mk: Add ethernet permission"

ranchu device now has gsm working properly, remove ethernet.

This reverts commit 9dcb26902571b6d8aa1a41e28be6fb87fd483425.
(cherry picked from commit 58d066f7ccb65cc1f2fc69aff5e95fbfc7f5f0f7)

Change-Id: I05ced00f7e24cb2af6654fc38d71d63453ce4944

8 years agoDefine a class for renderscript bitcode files
Dan Willemsen [Sat, 13 Feb 2016 08:19:40 +0000 (00:19 -0800)]
Define a class for renderscript bitcode files

These have been using SHARED_LIBRARIES, but aren't elf shared libraries.
Continue installing them to /system/lib[64], but do not apply any other
normal shared library logic to them.

(cherry picked from commit c6e194ffadc2b2c83daed3011d6afa1764244499)

Change-Id: I0041650af92cd8063ca33215010d5eff514a89bc

8 years agoemulator: Include the ranchu gps library
Chaoren Lin [Wed, 18 Nov 2015 02:55:33 +0000 (18:55 -0800)]
emulator: Include the ranchu gps library

Change-Id: I45b8bec7739b42744766852b68580b01b4ce26a0
(cherry picked from commit b8b6638dd0183c68e12ed88f1a4cbdce84c09a15)

8 years agoMerge "Add camera.ranchu.* to target/product/emulator.mk" into nyc-dev
Prathmesh Prabhu [Fri, 19 Feb 2016 00:39:05 +0000 (00:39 +0000)]
Merge "Add camera.ranchu.* to target/product/emulator.mk" into nyc-dev

8 years agoMerge "Switch to production constant for v2 signing scheme ID." into nyc-dev
Alex Klyubin [Thu, 18 Feb 2016 02:03:32 +0000 (02:03 +0000)]
Merge "Switch to production constant for v2 signing scheme ID." into nyc-dev

8 years agoAdd camera.ranchu.* to target/product/emulator.mk
Lingfeng Yang [Tue, 17 Nov 2015 23:42:23 +0000 (15:42 -0800)]
Add camera.ranchu.* to target/product/emulator.mk

This is for QEMU2 camera support in
the new emulator.

Change-Id: I036773719eff97619594e9d9ac161c10b5e218b5
(cherry picked from commit 6a3bbdce10aae72727d97ab09d90c967cfd51b9c)

8 years agoUse LOCAL_COMPATIBILITY_SUPPORT_FILES relative to $(TOP).
Ying Wang [Tue, 16 Feb 2016 23:42:26 +0000 (15:42 -0800)]
Use LOCAL_COMPATIBILITY_SUPPORT_FILES relative to $(TOP).

So that you can have LOCAL_COMPATIBILITY_SUPPORT_FILES generated in the
out directory.

Change-Id: I3e011fc3db5de170f7befcb12841d230283671a6
(cherry picked from commit c3e4b2f390301ffd86a8773d6fb5336b71564dad)

8 years agoSwitch to production constant for v2 signing scheme ID.
Alex Klyubin [Tue, 16 Feb 2016 20:42:37 +0000 (12:42 -0800)]
Switch to production constant for v2 signing scheme ID.

Bug: 25794543

(cherry picked from commit 97dd58a071c16c31ab2ce3f29f8fa7e2db7c8b52)

Change-Id: Iefb8eec4e512115bc6a0f5126249e8b2c8b66ddb

8 years agomakeparallel: unset MAKEFLAGS and MAKELEVEL
Colin Cross [Fri, 5 Feb 2016 08:10:20 +0000 (00:10 -0800)]
makeparallel: unset MAKEFLAGS and MAKELEVEL

makeparallel inherits values for MAKEFLAGS and MAKELEVEL from make
through the environment, but they should not be propagated to the child
process in case the child process tries to run make again.

Bug: 26071246
Change-Id: I4c5df10ea8055cd1f1f61a892d5b1a7acb287bbb
(cherry picked from commit d8f0d68b78e968c5d014a9bac9463dbcf522b1c5)

8 years agoChange the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8
Neil Fuller [Tue, 16 Feb 2016 13:04:51 +0000 (13:04 +0000)]
Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8

Modify the compiler flags for Jack and javac.

This has the following effects:
1) Generally, some of the type inference rules changed.
2) javac: bytecode is generated with the v52 major version (not v51)
3) jack: Java 8 language features are supported.

The javac / dx toolchain does not support Java 8 language features.

Bug: 26753820
Change-Id: Icf619f601def30600a42a70815fc8cc754eafa8a

8 years agoMerge "Add mediadrm service" into nyc-dev
Jeff Tinker [Sat, 13 Feb 2016 08:08:33 +0000 (08:08 +0000)]
Merge "Add mediadrm service" into nyc-dev

8 years agoAdd mediadrm service
Jeff Tinker [Fri, 12 Feb 2016 17:00:49 +0000 (09:00 -0800)]
Add mediadrm service

Part of media security hardening

This is an intermediate step toward moving
mediadrm to a new service separate from mediaserver.
This first step allows mediadrmservice to run based
on the system property media.mediadrmservice.enable
so it can be selectively enabled on devices that
support using native_handles for secure buffers.

bug: 22990512
Change-Id: I9fecb59158d560201f64721cdc026f5604cc3945

8 years agoFix 2 unused parameter warnings in zipalign.
Aurimas Liutikas [Fri, 12 Feb 2016 02:11:21 +0000 (18:11 -0800)]
Fix 2 unused parameter warnings in zipalign.

ZipFile parameter was not used and therefore can be removed.

Bug: 26936282
Change-Id: Id2b6e693b40571b7e7486304a6effaedc1b3c940

8 years agoMerge "Sign APKs using SHA-256 instead of SHA-1 when possible." into nyc-dev
Alex Klyubin [Thu, 11 Feb 2016 18:50:12 +0000 (18:50 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." into nyc-dev

8 years agoMakefile: Add the missing library in otatools.zip.
Tao Bao [Thu, 11 Feb 2016 17:50:41 +0000 (09:50 -0800)]
Makefile: Add the missing library in otatools.zip.

With the change in [1], delta_generator now needs
libprotobuf-cpp-lite.so instead of libprotobuf-cpp-lite-rtti.so to
generate A/B payloads.

[1] commit ab5bd668f6be600a8cceb8772e426c0aa902a5e1

Bug: 27145830
Change-Id: Ib9a93bf0fbe7fa44fc5fb94668d17fa1a2e07b05

8 years agoMerge "Remove usages of jill.jar, use jack instead" into nyc-dev
Sebastien Hertz [Thu, 11 Feb 2016 09:49:07 +0000 (09:49 +0000)]
Merge "Remove usages of jill.jar, use jack instead" into nyc-dev

8 years agoSign APKs using SHA-256 instead of SHA-1 when possible.
Alex Klyubin [Wed, 13 Jan 2016 18:32:47 +0000 (10:32 -0800)]
Sign APKs using SHA-256 instead of SHA-1 when possible.

This changes the build system to provide the signapk tool with the
minSdkVersion of the APK being signed. signapk in turn will then use
SHA-256 instead of SHA-1 if minSdkVersion is 18 (JB MR2) or higher
(see c2c49ed0c13846f7f96249c7419971dfcddc9215).

To avoid increasing incremental OTA update package sizes for already
released platforms, release build scripts disable the above logic when
signing target files ZIPs for pre-N platforms.

Bug: 25643280

(cherry picked from commit 2cfd1d108c82bdedccb03917e09aa5e677e8fde2)

Change-Id: I38450d07ddc05c705de40313f843beada8db7d98

8 years agoFix metadata location when file system doesn't span the partition
Sami Tolvanen [Tue, 9 Feb 2016 20:28:58 +0000 (12:28 -0800)]
Fix metadata location when file system doesn't span the partition

Pad the sparse image with a zero fill chunk to correctly position
verity and FEC metadata at the end of the partition.

Bug: 27073791
Change-Id: I9f70d579a42e5007d50e9c02a98a608d2815f0ed
(cherry picked from commit 6a8781a25113b9b49dddc8c8e043c27d5a943e3a)

8 years agoMerge "Use Jan 1 2009 as timestamp in OTA update ZIPs." into nyc-dev
Alex Klyubin [Wed, 10 Feb 2016 18:15:26 +0000 (18:15 +0000)]
Merge "Use Jan 1 2009 as timestamp in OTA update ZIPs." into nyc-dev

8 years agoreleasetools: Add two new entries to metadata.
Tao Bao [Thu, 4 Feb 2016 22:26:02 +0000 (14:26 -0800)]
releasetools: Add two new entries to metadata.

Add "ota-required-cache" into the metadata file in an OTA package,
which shows the minimum free space on /cache to apply the update.

Add "ota-type" into the metadata file, which shows the OTA type for
this package (i.e. one of FILE, BLOCK and AB).

Also add the cache free space check into updater-script when generating
block-based incremental OTAs (we only had such lines for file-based
incrementals before).

Bug: 26731903
Change-Id: Id6ff0fc4cdfb1443636b0b3800b0f8bddb5bb1d0
(cherry picked from commit d8d14bec0d9fb604060634729b4a09c7898d0c9a)