Commit graph

9438 commits

Author SHA1 Message Date
Stuart Scott
cc52da8dae Add cts_v2 phony target for temporary build fix.
Change-Id: I770dc800dbcdff2c31e370410b32e2ee079f308b
2016-03-02 08:42:41 -08:00
Stephen Hines
ed68f54ba0 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
2016-03-01 21:36:15 +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
Dan Willemsen
48fd6d4dc0 Remove debug statement
(cherry picked from commit dbf0792279)

Change-Id: I769ed278012d3b77f6446c24787ea8d3fe29861a
2016-02-29 13:55:37 -08:00
Dan Willemsen
fe7f737103 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 d6e3b84185)

Change-Id: I99cb69ea1756b8258f15d3630c75c9ffe277aaef
2016-02-29 13:55:14 -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
Stephen Hines
6f82901188 Update to use the latest clang-2629532.
Bug: http://b/25642296

(cherry picked from commit 352bccb65e)

Change-Id: I57bcbed0d7d51864ba7d7325334e9bbbba9f847b
2016-02-26 18:51:26 -08:00
Chih-Hung Hsieh
71d8cbd9b6 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 765c1ea6d7)

Change-Id: I6e51e51ff4ed3ce514f60d090494dcdf6e520b04
2016-02-26 18:51:26 -08:00
Dan Willemsen
7e57b8ca57 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 9ecbf83259)

Change-Id: Iab2d36e20d7002568c3534e7781e9ac8ab21a4a9
2016-02-26 18:51:26 -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
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
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
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
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
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
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
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
Zach Jang
7e6a1633c8 Updating security string patch to 2016-04-01 am: e182d2a95c
am: 054bbb9766

* commit '054bbb9766312a2caefd5375341d49074a6d25bf':
  Updating security string patch to 2016-04-01
2016-02-19 22:06:14 +00:00
Zach Jang
054bbb9766 Updating security string patch to 2016-04-01
am: e182d2a95c

* commit 'e182d2a95c52e37d2a6f924c8ff386b52b08a0c9':
  Updating security string patch to 2016-04-01
2016-02-19 22:00:21 +00:00
Zach Jang
e182d2a95c Updating security string patch to 2016-04-01
b/27272697

Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e
2016-02-19 13:50:29 -08:00
Dan Willemsen
c12ad5c5c0 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 c6e194ffad)

Change-Id: I0041650af92cd8063ca33215010d5eff514a89bc
2016-02-18 17:34:53 -08:00
Ying Wang
150fd17a40 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 c3e4b2f390)
2016-02-17 20:36:15 +00:00
Neil Fuller
dfcd912488 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
2016-02-16 13:04:51 +00:00
Alex Klyubin
0c5c50997b Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." into nyc-dev 2016-02-11 18:50:12 +00:00
Tao Bao
fdd2693b65 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
2016-02-11 09:53:51 -08:00
Alex Klyubin
b05b62df2e 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 c2c49ed0c1).

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 2cfd1d108c)

Change-Id: I38450d07ddc05c705de40313f843beada8db7d98
2016-02-10 17:19:08 -08:00
Yohann Roussel
d87cc99af2 Remove usages of jill.jar, use jack instead
Bug: 27113650
(cherry picked from commit d0bb7bdf5a)

Change-Id: I218ed2bda032b00bee4c52994a0aadce6d699133
2016-02-10 18:05:38 +01:00
Patrick Tjin
e11aa50bb2 Add compressor options for squashfs vendor images
Change-Id: I4f9f5d62e24654cb37d436cb73dd5893aed30fa8
2016-02-09 15:41:07 -08:00
Patrick Tjin
426ec55b41 Allow squashfs for vendor image only
Previously, the squashfs dependencies were included only if
the system image was squashfs.  Allow the vendor image trigger
the dependency.

Change-Id: I5b1c513e9c13d83efc3ca6a904f08a91d9cca85f
2016-02-09 14:12:47 -08:00
Dan Willemsen
6fca454c41 Merge "Fix unused src tracking for generated .o files" am: 478913f88f
am: d02bb7bfc5

* commit 'd02bb7bfc51343ab88eb2e05157155673ddf8130':
  Fix unused src tracking for generated .o files
2016-02-05 18:20:34 +00:00
Dan Willemsen
d02bb7bfc5 Merge "Fix unused src tracking for generated .o files"
am: 478913f88f

* commit '478913f88fdafc61015e87129486e12ddeb7d184':
  Fix unused src tracking for generated .o files
2016-02-05 18:18:20 +00:00
Dan Willemsen
478913f88f Merge "Fix unused src tracking for generated .o files" 2016-02-05 18:12:20 +00:00
Colin Cross
c2f1d01eec Merge "Don\'t build otatools for PDK" am: 9e8866f4a4
am: 3611f2f440

* commit '3611f2f440944dadd74b36a235c41c7957a6963c':
  Don't build otatools for PDK
2016-02-05 00:04:43 +00:00
Colin Cross
3611f2f440 Merge "Don\'t build otatools for PDK"
am: 9e8866f4a4

* commit '9e8866f4a4ec60778d55366afaf29f7d2e22e9ee':
  Don't build otatools for PDK
2016-02-05 00:01:49 +00:00
Colin Cross
9e8866f4a4 Merge "Don't build otatools for PDK" 2016-02-04 23:49:41 +00:00