Commit Graph

27791 Commits

Author SHA1 Message Date
Neil Fuller 30b21ad579 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
2016-03-02 11:19:41 +00:00
Dimitry Ivanov 837d60f49a Merge "Add options for dynamic linker developer warnings" into nyc-dev 2016-03-01 17:50:02 +00:00
Adam Lesinski 7214d224b8 Merge "AAPT2: Enable product/config filtering and improve source ordering" into nyc-dev 2016-03-01 17:49:04 +00:00
Stuart Scott 794308f169 Switch to CTSv2
bug:21762834
Change-Id: If91fd4de148241760ff29cbe227864e301a9fca7
2016-02-29 20:47:35 -08:00
Nick Kralevich 133e1e1f16 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
a8b3d54101).

(cherry picked from commit 3cb10bbd3b)

Change-Id: I1d8ad7e06112777c66abed4546dadb85d35e33e1
2016-02-29 08:45:31 -08:00
Dimitry Ivanov f22789edd0 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
2016-02-27 01:18:24 -08:00
Adam Lesinski e758f9319d 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
2016-02-26 16:11:20 -08:00
Ying Wang 6dece90534 Merge "AAPT2: library resource compilation" into nyc-dev 2016-02-26 22:58:12 +00:00
Prathmesh Prabhu 98afd8ab2a [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
2016-02-26 19:26:05 +00:00
Keun Soo Yim 4773d29ab7 Merge "build file change for vts to use the existing cts-tradefed infrastructure" into nyc-dev 2016-02-26 19:24:10 +00:00
Ying Wang e295c3df68 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
2016-02-26 10:44:56 -08:00
Lorenzo Colitti a8f699a6a2 Remove dhcpcd from the base target makefile.
Bug: 27192644
Change-Id: Iacac58e05c441dd267c7f09f91dbfcb94f54167c
2016-02-26 10:02:32 +09:00
Tao Bao 4da324e1a4 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 5d1825664a)
2016-02-25 16:39:42 -08:00
Keun Soo Yim 172b7d421e build file change for vts to use the existing cts-tradefed infrastructure
Mostly done by stuartscott@

Change-Id: I016405757f39df833d532bc01fd2237e5e961a8a
2016-02-24 16:12:49 -08:00
Alex Light f68339b025 Merge "Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE" into nyc-dev 2016-02-24 23:34:06 +00:00
Alex Light eed015a1aa Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE
(cherry picked from commit bdfeb3e760)

Bug: 27340895
Bug: 27324856

Change-Id: Id3994c6d334c8bb673fc3849550f591136a8dd6a
2016-02-24 15:27:08 -08:00
Dan Willemsen ce330e5f91 Merge "Warn more clearly when there are duplicate copied headers" into nyc-dev 2016-02-24 18:31:42 +00:00
Neil Fuller 74c78f950c Merge "Revert "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8""" into nyc-dev 2016-02-24 10:15:14 +00:00
Ying Wang d28518d96a 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.
2016-02-24 05:49:25 +00:00
Ying Wang c37b5a6c4d Update mac_sdk_versions_supported. am: 8df3355f64 am: 0954a9d91f am: 2114b48a14
am: 938722577b  -s ours

* commit '938722577bb7005dd321534ca29de2ccf71869e7':
  Update mac_sdk_versions_supported.
2016-02-24 05:49:13 +00:00
Ying Wang 6a95943887 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.
2016-02-24 03:01:39 +00:00
Ying Wang 938722577b Update mac_sdk_versions_supported. am: 8df3355f64 am: 0954a9d91f
am: 2114b48a14

* commit '2114b48a14c6108d2d4d3207c2eb87d2d72ab76d':
  Update mac_sdk_versions_supported.
2016-02-24 03:01:22 +00:00
Ying Wang e511a07677 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.
2016-02-24 02:55:16 +00:00
Ying Wang 2114b48a14 Update mac_sdk_versions_supported. am: 8df3355f64
am: 0954a9d91f

* commit '0954a9d91f8f68133150a39afc364e1ad091a19b':
  Update mac_sdk_versions_supported.
2016-02-24 02:54:51 +00:00
Ying Wang 773b017ee9 Allow to build against Mac OS X SDK 10.11.
am: 7f7c698959

* commit '7f7c6989590bd9395e8ebf3a01b5b4033c89d7d1':
  Allow to build against Mac OS X SDK 10.11.
2016-02-24 02:46:46 +00:00
Ying Wang 0954a9d91f Update mac_sdk_versions_supported.
am: 8df3355f64

* commit '8df3355f64119adb9ca71c9f2cc9b51afb61c65a':
  Update mac_sdk_versions_supported.
2016-02-24 02:46:36 +00:00
Ying Wang 7f7c698959 Allow to build against Mac OS X SDK 10.11.
Bug: 24739158
Change-Id: I7c57e141dd02a0d2de5a7a1ccbc72ffe422a8d6f
2016-02-23 18:15:15 -08:00
Ying Wang 8df3355f64 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
2016-02-23 18:13:03 -08:00
bohu 08ddb47165 Emulator: Add fingerprint permission to sdk system images
Since N, the android.hardware.fingerprint.xml is required.
bug: 27324642

Change-Id: Ib2f77f68bb4b9a68e1e77311fae3ce2a30bc37cb
2016-02-23 16:28:26 -08:00
Dan Willemsen 4fbc164da8 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 6f60f020d7)
2016-02-23 16:09:49 -08:00
Bo Hu fed6c5cb0b Merge "emulator: allows surfaceflinger to change qemu.gles value" into nyc-dev 2016-02-23 21:46:34 +00:00
Prathmesh Prabhu e6ea602bb4 Generic x86_64: Bump system image partition size to 1.75 GB.
BUG=b.android.com/201662

Change-Id: I3b13082d73a3e1c9f49cb9158d2423dc580a8c75
2016-02-23 20:33:23 +00:00
Ying Wang 8c89b4b546 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 86e74b96fc)

Change-Id: I79393bc416fafb6d9cd28b12070a58ae5731587d
2016-02-23 10:54:30 -08:00
Neil Fuller 3f7300147d Revert "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8""
This reverts commit 799d603029.
2016-02-23 12:55:23 +00:00
Neil Fuller 5ae8b0bad2 Merge "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8"" into nyc-dev 2016-02-23 10:24:40 +00:00
Neil Fuller 799d603029 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 dfcd912488.

Change-Id: I055f35c0a7400ab2887c91d017eebaed1adaf972
2016-02-23 10:18:42 +00:00
Neil Fuller d919cd6509 Merge "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8" into nyc-dev 2016-02-23 09:47:35 +00:00
Sami Tolvanen e018f608e8 Clear logd intermediates
Needed by changes from
  Idcdc5bff133f13c1267f0ec0a75cc8cf1ddbda0d

Bug: 26902605
Change-Id: Id3ca7889ede30b54b7af73dd50653ca1a20d59aa
(cherry picked from commit d7da0ffb20)
2016-02-22 13:58:56 -08:00
Yohann Roussel 6519b90bac Merge "Add support for testing obfuscated app with Jack" into nyc-dev 2016-02-22 13:04:51 +00:00
Calin Juravle 5d598c12fe Merge "Add profman to the build scripts" into nyc-dev 2016-02-22 11:42:02 +00:00
Yohann Roussel b7de0fb1ed Add support for testing obfuscated app with Jack
Bug: 17481317
Bug: 27215871
Bug: 27215868

(cherry picked from commit 505dafb03b)

Change-Id: Ia12fb92585cfcc595eef6cd096d27e779e596f7d
2016-02-22 11:51:54 +01:00
bohu 37f5b608e1 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
2016-02-20 01:39:27 +00:00
Prathmesh Prabhu 61ec9aed12 Merge "Allow smooth upgrade of AVD's from older API's." into nyc-dev 2016-02-20 01:02:03 +00:00
Lingfeng Yang ae74914ed9 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)
2016-02-20 00:34:21 +00:00
Bjoern Johansson d2cd53a41b 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)
2016-02-19 23:25:46 +00:00
Zach Jang 17edabb183 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
2016-02-19 22:34:03 +00:00
Zach Jang c4d9b64a68 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
2016-02-19 22:28:35 +00:00
Zach Jang fc30358acb 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
2016-02-19 22:22:57 +00:00
Zach Jang 3f53b385de 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
2016-02-19 22:17:28 +00:00
Zach Jang eb651e2e45 Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766
am: 7e6a1633c8

* commit '7e6a1633c8ebb622271020cbb0aedae355e6501a':
  Updating security string patch to 2016-04-01
2016-02-19 22:11:32 +00:00