OSDN Git Service
Dan Willemsen [Wed, 30 Mar 2016 20:36:01 +0000 (13:36 -0700)]
Remove extraneous /
This matches the line we use in Soong, and behaves no differently.
Change-Id: I4487f7f5555edd08dc67a22d547f8218d46ccd8f
Dan Willemsen [Wed, 30 Mar 2016 00:38:32 +0000 (00:38 +0000)]
Merge "Darwin: Use the same `ar` as Soong"
Dan Willemsen [Tue, 29 Mar 2016 23:21:32 +0000 (16:21 -0700)]
Darwin: Use the same `ar` as Soong
Soong uses the copy of `ar` in the OSX SDK instead of the wrapper in
/usr/bin/ar. /usr/bin/ar appears to be a thin wrapper that looks up the
current SDK and passes execution to it. Soong does this so that it can
actually set up a dependency on the tool.
Change-Id: Ia4e4fbe3287539933fa98a1354c3ccee91f4d552
Dan Willemsen [Tue, 29 Mar 2016 20:54:23 +0000 (20:54 +0000)]
Merge "Forbid Clang for Windows"
Shinichiro Hamaji [Tue, 29 Mar 2016 20:40:31 +0000 (20:40 +0000)]
Merge "Fix dependencies around tools/*-event-log-tags.py"
Dan Willemsen [Tue, 29 Mar 2016 19:34:03 +0000 (12:34 -0700)]
Forbid Clang for Windows
Clang and MinGW are not expected to work together currently, and you get
strange errors when this is attempted. Instead, error out with a clear
error message.
Before the windows build rewrite, we'd just explicitly set my_clang to
false without checking what the module asked for. Now, error out if the
module explicitly asked for clang, since by default they'd have it
already if it wasn't for windows. That way when Clang+Windows does
become possible, it can gradually be tested by setting LOCAL_CLANG to
true.
Change-Id: I9e0b0dca30946d94894119443f2fd0593cee1793
allenhair [Tue, 29 Mar 2016 19:20:10 +0000 (19:20 +0000)]
Merge "Only add jacocoagent if the package contains some java code."
Shinichiro Hamaji [Mon, 28 Mar 2016 18:29:21 +0000 (03:29 +0900)]
Fix dependencies around tools/*-event-log-tags.py
We should regenerate merged tag files and java sources when
these scripts are updated.
Change-Id: Id5f11d6f480f3f74dab08f01e929ee2d7fafd2d0
Allen Hair [Mon, 28 Mar 2016 19:52:37 +0000 (12:52 -0700)]
Only add jacocoagent if the package contains some java code.
Bug:
27877982
Change-Id: I8bf05d67a823402e7e488990753cc9005ec5e90b
Sebastien Hertz [Tue, 29 Mar 2016 07:17:12 +0000 (07:17 +0000)]
Merge "Rename emma coverage files"
Ying Wang [Sat, 26 Mar 2016 01:41:38 +0000 (01:41 +0000)]
Merge "Remove javac support in host dex rules."
Ying Wang [Sat, 26 Mar 2016 01:27:32 +0000 (01:27 +0000)]
Merge "[DO NOT MERGE] Remove code pulled in by accident."
Ying Wang [Sat, 26 Mar 2016 01:14:49 +0000 (18:14 -0700)]
[DO NOT MERGE] Remove code pulled in by accident.
Remove code pulled in by accident in cherry-pick commit
fbc5b9f56.
Change-Id: I4e4a336faf71782c208631c581b2587a5364212f
Ying Wang [Fri, 25 Mar 2016 21:41:41 +0000 (21:41 +0000)]
Merge "Support x86+arm multilib build."
Ying Wang [Thu, 17 Mar 2016 02:53:19 +0000 (19:53 -0700)]
Support x86+arm multilib build.
Support TARGET_2ND_ARCH as the binary translation arch.
See target/board/generic_x86_arm/BoardConfig.mk and
target/product/aosp_x86_arm.mk as example for the setup.
In BoardConfig, use the TARGET_2ND_ARCH/etc. variables to set up the
binary translation arch;
Set "TARGET_TRANSLATE_2ND_ARCH := true" to tell the build system it's
not a typical 64-bit multilib configuration.
In product makefile, use "PRODUCT_PACKAGES += libfoo_<2nd_arch>" to
install the TARGET_2ND_ARCH libraries. This also pulls in any dependency
libraries.
By default we don't install any TARGET_2ND_ARCH modules, unless it's
pulled in by PRODUCT_PACKAGES.
Bug:
27526885
Change-Id: I0578e9c80da0532d2fa886a8fcdb140bbc703009
(cherry-pick from commit
277e75a488b1b6599482aed9f7c046747baa10df)
Ying Wang [Fri, 25 Mar 2016 20:16:31 +0000 (20:16 +0000)]
Merge "Use $(BUILD_SYSTEM) as the LOCAL_PATH of auto-generated modules."
Ying Wang [Fri, 25 Mar 2016 20:16:25 +0000 (20:16 +0000)]
Merge "Rebuild odex files in PDK fusion build."
Tao Bao [Fri, 25 Mar 2016 18:49:56 +0000 (18:49 +0000)]
Merge "rangelib.py: Add parse_raw() method."
Ying Wang [Fri, 25 Mar 2016 00:24:38 +0000 (17:24 -0700)]
Use $(BUILD_SYSTEM) as the LOCAL_PATH of auto-generated modules.
So that we don't mess up with the vendor path check by accident.
Bug:
27543283
Change-Id: I6c34caefe3ff4abfdd8349a32c68fcca524cfd8e
(cherry-pick from commit
efaf5efd06ce0caf739ce48690f2384b37a791d5)
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
(cherry-pick from commit
3a61eeb6cb588b9a206bd80814183bcc0263cd13)
Ying Wang [Fri, 25 Mar 2016 17:29:30 +0000 (17:29 +0000)]
Merge "Remove rmtypedefs from the build system."
Sebastien Hertz [Fri, 25 Mar 2016 16:11:38 +0000 (17:11 +0100)]
Rename emma coverage files
We no longer use emma with Jack. However, during the process of a
full build, we may run the emma task and overwrite the coverage file
generated by Jack with the one from emma because they use the same
filename.
This CL renames coverage files generated by emma so they no longer
break those created by Jack.
Bug:
27822188
Change-Id: Ie3fdc2b8f53deafbefbd6973e39f29d8c46f371e
Ying Wang [Thu, 24 Mar 2016 23:41:48 +0000 (16:41 -0700)]
Remove javac support in host dex rules.
- Remove javac support in host_dalvik_java_library.mk
- Simplify host_dalvik_static_java_library.mk by including
host_dalvik_java_library.mk instead of host_java_library.mk.
- Take configure_local_jack out of host_java_library_common.mk because
it's only needed by host dalvik java libraries.
Bug:
27400061
Change-Id: I4088b09092198118d832a759663bbaadff669ed5
Tao Bao [Thu, 24 Mar 2016 21:50:37 +0000 (21:50 +0000)]
Merge "Add libbase to otatools"
Dan Willemsen [Thu, 24 Mar 2016 20:38:08 +0000 (20:38 +0000)]
Merge "Handle symlinked OUT_DIRs (again)"
Ying Wang [Thu, 24 Mar 2016 19:25:56 +0000 (12:25 -0700)]
Remove rmtypedefs from the build system.
We don't need to run rmtypedefs in javac compilation now, because the
runtime libraries are compiled by only jack, which takes care of
rmtypedefs by itself.
Bug:
27828139
Change-Id: Ie480ae5aead8f3f58f956978fc4a05c28a35dec6
Ying Wang [Thu, 24 Mar 2016 18:30:56 +0000 (18:30 +0000)]
Merge "Add phony target javac-check."
Ying Wang [Thu, 24 Mar 2016 18:00:30 +0000 (11:00 -0700)]
Add phony target javac-check.
javac-check covers all classes.jars that are compiled with javac
instead of jack. This target is required by tools that still need java
class files as input.
Bug:
26705771
Change-Id: I6896b9a6026a2a0dae6145d1ef5a839756aa3458
Tao Bao [Thu, 24 Mar 2016 18:08:51 +0000 (11:08 -0700)]
rangelib.py: Add parse_raw() method.
parse_raw() parses a string generated by RangeSet.to_string_raw().
>>> RangeSet.parse_raw(RangeSet("0-9").to_string_raw())
<RangeSet("0-9")>
Change-Id: Ia74daa30476d5e9ad73c368f4ecc64c755b734a5
Johan Redestig [Thu, 24 Mar 2016 12:57:03 +0000 (13:57 +0100)]
Add libbase to otatools
build_verity_tree uses libbase since
b104044.
Change-Id: I6d3406a107ceb6cd58d1a51aa79935209d4c435f
Dan Albert [Thu, 24 Mar 2016 01:26:09 +0000 (01:26 +0000)]
Merge "Add support for multiple flavors of the NDK gtest."
Dan Albert [Thu, 24 Mar 2016 01:26:09 +0000 (01:26 +0000)]
Merge "Using stlport_static or c++_static requires libdl."
Alex Klyubin [Thu, 24 Mar 2016 00:59:01 +0000 (00:59 +0000)]
Merge "Fix bug in APK entry alignment."
Dan Willemsen [Wed, 23 Mar 2016 23:12:46 +0000 (23:12 +0000)]
Merge "Remove ALL_PREBUILT, all users have been removed"
Ying Wang [Wed, 23 Mar 2016 23:04:54 +0000 (23:04 +0000)]
Merge "Phony target $(LOCAL_MODULE) covers all multilib variants."
Dan Willemsen [Wed, 23 Mar 2016 21:14:35 +0000 (14:14 -0700)]
Remove ALL_PREBUILT, all users have been removed
Change-Id: I37154506ef419e7a68ce7e2d864624d2ae53206f
Dan Albert [Wed, 23 Mar 2016 00:19:03 +0000 (17:19 -0700)]
Add support for multiple flavors of the NDK gtest.
Since gtest depends on the STL, we need one version for each STL.
Bug: http://b/
27801981
Change-Id: Id1a5571b043e2513d0184a9ab45a473dd545da84
Alex Klyubin [Wed, 23 Mar 2016 20:05:27 +0000 (13:05 -0700)]
Fix bug in APK entry alignment.
APK entry alignment logic assumes that input entries have zero-length
comment and extra fields. When the assumption is broken, the logic
silently breaks alignment of output entries. This happens, for
example, when the APK to be signed is already aligned and thus may
contain entries with non-empty extra fields.
Given that APKs are not supposed to use comment and extra fields for
anything useful and given that this signer already discards comment
and extra fields of compressed entries, this change makes the signer
discard comment and extra fields of STORED input entries as well.
This unbreaks the existing alignment logic.
Bug:
27814973
Change-Id: I8242b037e21ba7bcf45d0fe2afc8bfc47f1ec314
Ying Wang [Wed, 23 Mar 2016 18:02:03 +0000 (11:02 -0700)]
Phony target $(LOCAL_MODULE) covers all multilib variants.
Bug:
27760875
Change-Id: Ie59e2c36964fa736b17fb4185563c08a8cb75b80
Ying Wang [Wed, 23 Mar 2016 16:37:34 +0000 (16:37 +0000)]
Merge "Create empty .a on Darwin when there is no obj file."
Dan Willemsen [Tue, 22 Mar 2016 21:44:17 +0000 (14:44 -0700)]
Handle symlinked OUT_DIRs (again)
My previous attempt at properly handling symlinked OUT_DIRs only worked
if the symlink was to a different directory, not one in the same
directory.
This time, make sure that both make and soong use the same
representation of the output directory by passing BUILDDIR to
bootstrap.bash. Soong has been updated to pick whether to use a relative
or absolute path back to the source tree depending on what makes sense.
If the BUILDDIR or the path back to the source tree change, re-run the
bootstrap.
Also, move the $OUT_DIR/Android.mk and $OUT_DIR/CleanSpec.mk generation
to before Kati runs. In the case that $TOP/out was symlinked to
$TOP/out.angler:
1) Soong generates out.angler/soong/Android.mk
2) Kati's find generator produces in-memory tree of the filesystem
3) $(shell ) creates out.angler/Android.mk
4) The emulated findleaves Android.mk search finds
out.angler/soong/Android.mk since the in-memory tree is never updated.
This doesn't happen in the normal case, because we pass --prune=$OUT_DIR
to findleaves.
Change-Id: Ib0fdae2e80f75ddcf33a3c8c5ea0978f5308b437
Ying Wang [Wed, 23 Mar 2016 01:23:13 +0000 (18:23 -0700)]
Create empty .a on Darwin when there is no obj file.
On Darwin ar would fail if there is no object file to add.
We work around by adding a dummy.o to the .a and then deleting it.
Bug:
27800477
Change-Id: I68bbebea2726058c25863d7026a645a520d05167
Dan Albert [Thu, 10 Mar 2016 23:17:09 +0000 (15:17 -0800)]
Using stlport_static or c++_static requires libdl.
Why? For one, libgcc's unwinder makes use of `dl_iterate_phdr`. Also,
libgabi++ (the home grown C++ RT we use for stlport) uses
`dlopen` for liblog when reporting fatal errors. The LLVM unwinder
which is used by libc++ also uses libdl.
Requiring a dependency on libdl seems less objectionable than
requiring one on liblog. We could always change libgabi++ to use
syslog instead, but that will only reach logcat for newer devices
(possibly L+, definitely M+).
Requiring libdl seems like the best option here, especially given
that libgcc needs it anyway.
Change-Id: I4acfaf38145c39fc15a76fbb282a46786e5322f1
Chih-hung Hsieh [Tue, 22 Mar 2016 18:37:24 +0000 (18:37 +0000)]
Merge "Dump table of warning counts before all warnings."
Chih-Hung Hsieh [Mon, 21 Mar 2016 21:11:03 +0000 (14:11 -0700)]
Dump table of warning counts before all warnings.
* The table of warning counts has links to each warning pattern section,
which has a new anchor.
* Each warning pattern section has a new link to the 'top' of the table
of warning counts.
* Background color of unknown warnings is changed to more visible light blue.
BUG:
27698849
Change-Id: Ia3d4a8511bd42f44f6a47afcb9c3889f6d62b9f2
Chih-hung Hsieh [Tue, 22 Mar 2016 17:33:19 +0000 (17:33 +0000)]
Merge "Add more patterns, dump sorted unique warnings."
Chih-Hung Hsieh [Mon, 21 Mar 2016 18:28:30 +0000 (11:28 -0700)]
Add more patterns, dump sorted unique warnings.
* Sort and remove duplicated warning messages.
* Recognize more warning message patterns from new clang compiler.
BUG: http://b/
27698849
Change-Id: Iebbe8600353269d8c2d49ef9d97a72be1d978a24
Colin Cross [Mon, 21 Mar 2016 22:38:00 +0000 (22:38 +0000)]
Merge "Remove support for device libstdc++ as stl"
Dan Willemsen [Mon, 21 Mar 2016 21:09:40 +0000 (21:09 +0000)]
Merge "Always run Soong"
David Zeuthen [Mon, 21 Mar 2016 15:46:29 +0000 (15:46 +0000)]
Merge "Add support for Brillo Verified Boot."
Pirama Arumuga Nainar [Fri, 18 Mar 2016 21:54:50 +0000 (21:54 +0000)]
Merge changes from topic 'rebase_r256229'
* changes:
Switch to clang-
2690385
Update RenderScript build rules for rebase to LLVM r256229
David Zeuthen [Fri, 29 Jan 2016 21:59:17 +0000 (16:59 -0500)]
Add support for Brillo Verified Boot.
The following variables are introduced
BOARD_BVB_ENABLE: can be set to true to build boot.img and system.img
files compatible with Brillo Verfied Boot.
BOARD_BVB_ROLLBACK_INDEX: can be set to an integer to use for the
rollback index.
BOARD_BVB_KEY_PATH, BOARD_BVB_ALGORITHM: If set, the former must be a
path to the private key used to sign the boot image and the latter must
be the algorithm to use. If unset, a test-key stored in the tree will
be used.
BOARD_BVB_MAKE_BOOT_IMAGE_ARGS: Extra options to pass to 'bvbtool
make_boot_image'.
BOARD_BVB_SIGN_BOOT_IMAGE_ARGS: Extra options to pass to 'bvbtool
sign_boot_image'.
BOARD_BVB_ADD_IMAGE_HASHES_ARGS: Extra options to pass to 'bvbtool
add_image_hashes'.
BOARD_CUSTOM_BVBTOOL: Can be set to specify what bvbtool program to
use.
The existing BOARD_KERNEL_CMDLINE variable is also used, as are existing
kernel and initrd-related variables. Therefore, simply adding
BOARD_BVB_ENABLE := true
to an existing Makefile should do the trick.
Bug:
26185038
TEST=Added 'BOARD_BVB_ENABLE := true' to hardware/bsp/intel/soc/edison/soc.mk
and built an image and then ran bvbtool's info_boot_image and
info_image_hashes commands on the resulting boot.img and system.img
files and verified that the information was correct. Also ran 'm dist'
and verified that the boot.img and system.img files in the resulting
target_files.zip file had similar information.
Change-Id: I08045ed8b0cbddc7c3acdd3a6f2c4bb75cb44bbc
Ying Wang [Fri, 18 Mar 2016 17:37:17 +0000 (17:37 +0000)]
Merge "Enable -Werror on zipalign"
Ying Wang [Fri, 18 Mar 2016 17:04:07 +0000 (10:04 -0700)]
Enable -Werror on zipalign
And fix the last warning to enable this flag.
Bug:
27695718
Change-Id: I70eb9c87530a9b982fbe83abea706908f0ce0356
Yohann Roussel [Fri, 18 Mar 2016 13:50:55 +0000 (13:50 +0000)]
Merge "Remove rules for building dex with dx"
Yohann Roussel [Fri, 18 Mar 2016 08:54:29 +0000 (08:54 +0000)]
Merge "Remove JILL, JACK_JAR and JILL_JAR"
Dimitry Ivanov [Thu, 17 Mar 2016 22:53:57 +0000 (22:53 +0000)]
Merge "Add config file listing public native libraries"
Ying Wang [Thu, 17 Mar 2016 22:44:28 +0000 (22:44 +0000)]
Merge "Fix compilation warning."
Ying Wang [Thu, 17 Mar 2016 21:44:42 +0000 (14:44 -0700)]
Fix compilation warning.
Fix compilation warning:
" destination for this 'memcpy' call is a pointer to dynamic class
'CentralDirEntry'; vtable pointer will be overwritten"
by removing unnecessary virtual desctructor.
Bug:
27695718
Change-Id: Id3c451f82374f2232176115b7bc3291ac4275c00
Pirama Arumuga Nainar [Thu, 17 Mar 2016 18:06:51 +0000 (11:06 -0700)]
Switch to clang-
2690385
http://b/
26987366
Change-Id: I1226f24b50319e321ea538362b2f26fcd227ca39
Pirama Arumuga Nainar [Thu, 17 Mar 2016 18:04:37 +0000 (11:04 -0700)]
Update RenderScript build rules for rebase to LLVM r256229
http://b/
26987366
- Use clang-
2690385 to build RenderScript toolchain.
- Use armv7-linux-androideabi as the triple used to build RenderScript
runtime libraries.
Change-Id: I582e8b25bbc38b101a2e765028ed61edbce7bdc2
Colin Cross [Thu, 17 Mar 2016 19:56:25 +0000 (12:56 -0700)]
Remove support for device libstdc++ as stl
Prevent platform modules from linking against libstdc++ as their STL
implementation. NDK modules may still use libstdc++.
Change-Id: I317c9bb90ca7d2e0c1f5770bbdff8075dfe3cc83
Sen Jiang [Thu, 17 Mar 2016 19:47:42 +0000 (19:47 +0000)]
Merge "Add zlib_fingerprint to target_files.zip"
Dimitry Ivanov [Wed, 16 Mar 2016 22:06:06 +0000 (15:06 -0700)]
Add config file listing public native libraries
This file contains list of libraries that should be directly or
indirectly accessible to apps for the platform. Note that this
file is not device specific but rather device class specific.
Bug: http://b/
27546414
Change-Id: Ica2e6c5cedac6e4af9bd78addaa512b2fa272d64
(cherry picked from commit
795132dccd954f5879b92b6c3a5137ce9b278ea3)
Chih-hung Hsieh [Thu, 17 Mar 2016 16:26:31 +0000 (16:26 +0000)]
Merge "Link in ASAN library if my_global_santitize is set."
Chih-hung Hsieh [Thu, 17 Mar 2016 16:01:27 +0000 (16:01 +0000)]
Merge "Classify more warning patterns."
Yohann Roussel [Thu, 17 Mar 2016 11:02:27 +0000 (12:02 +0100)]
Remove JILL, JACK_JAR and JILL_JAR
Also ensure that sdk.atree can find jack.jar and jill.jar from prebuilt.
Bug:
27372042
Change-Id: Ie266104e51c09fa21ccb09c1f27ad7068472965c
Chih-Hung Hsieh [Wed, 16 Mar 2016 19:18:16 +0000 (12:18 -0700)]
Classify more warning patterns.
Some warnings are from clang static analyzer
and they do not have compiler -W flag.
BUG:
27698849
Change-Id: I3d1fc9c2d6c60100e87f8ea201d3f8314370fccd
Dan Willemsen [Wed, 16 Mar 2016 20:14:27 +0000 (20:14 +0000)]
Merge "Add SOONG_ALLOW_MISSING_DEPENDENCIES"
Yohann Roussel [Wed, 16 Mar 2016 20:00:19 +0000 (20:00 +0000)]
Merge "Fix jack min sdk version for ub branches"
Dan Willemsen [Wed, 16 Mar 2016 18:12:41 +0000 (11:12 -0700)]
Add SOONG_ALLOW_MISSING_DEPENDENCIES
Split out Soong's missing dependency option from Unbundled_build. There
are builds other than unbundled builds that don't have a full platform
tree (AOSP llvm branch is one example).
When this is set to true, Soong will defer the error for missing
dependencies until a module is attempted to be built, instead of when
it is reading and generating the build rules. So for platform builds it
will still fail early if something is missing.
Change-Id: I56cb881ff55f5928b77cddc0d67086c3d37e43d7
Tao Bao [Wed, 16 Mar 2016 19:14:05 +0000 (19:14 +0000)]
Merge "Revert "Revert "releasetools: Support OTAs that have OEM properties changes."""
Sen Jiang [Tue, 8 Mar 2016 00:51:01 +0000 (16:51 -0800)]
Add zlib_fingerprint to target_files.zip
Test: make dist on edison-userdebug
Bug:
27156099
Change-Id: I4ba9095ecc5bb1730b8d0ba2d56d20fdbff3acaa
Yohann Roussel [Wed, 16 Mar 2016 16:18:32 +0000 (17:18 +0100)]
Fix jack min sdk version for ub branches
Bug:
27371864
(cherry picked from commit
d6101b678688bce96d67f8d945537f405f648194)
Change-Id: Idd926f5667fbe4275f8f1d80733b8c4471570874
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 15:52:57 +0000 (15:52 +0000)]
Merge "Add java.util.stream to whitelisted packages"
Yohann Roussel [Wed, 16 Mar 2016 14:19:04 +0000 (14:19 +0000)]
Merge "Inform Jack of the min sdk"
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 13:45:23 +0000 (13:45 +0000)]
Add java.util.stream to whitelisted packages
Bug:
27692239
Change-Id: I50e671222efc415fb930e5493f1943c5b8f6a71c
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
Change-Id: I5db233fe09aed0fae37fe9a92658bc8f24b86cdf
Yohann Roussel [Wed, 16 Mar 2016 09:33:02 +0000 (10:33 +0100)]
Remove rules for building dex with dx
This is just to ensure no dex file is built with dx any more, cleaning
of the build rules from Jack optionality is still to be done.
Bug:
27218410
Change-Id: Iea2c66802b6c64c52690ad9d6d487bdce5f50b79
Sen Jiang [Wed, 16 Mar 2016 04:04:41 +0000 (04:04 +0000)]
Merge "Revert "Add zlib_fingerprint to target_files.zip""
Sen Jiang [Wed, 16 Mar 2016 03:38:29 +0000 (03:38 +0000)]
Revert "Add zlib_fingerprint to target_files.zip"
This reverts commit
d8c715bf34ca6f637d6b15c8cd50d666137d05a3.
Change-Id: Ie0c3c5b2db89fe076d678b67f013c20e836d825f
Sen Jiang [Wed, 16 Mar 2016 02:59:36 +0000 (02:59 +0000)]
Merge "Add zlib_fingerprint to target_files.zip"
Chih-Hung Hsieh [Wed, 9 Mar 2016 22:54:55 +0000 (14:54 -0800)]
Link in ASAN library if my_global_santitize is set.
* When my_global_santitize is set and requires ASAN,
link with ASAN library even when local module is not
instrumented with ASAN, unless the local module is
the ASAN library itself.
* Add -Wl,--as-needed to my_ldflags for shared libraries
so that unneeded ASAN library would not become
a dependent of the built .so file.
* Change shared file and executable file link argument order
so that -Wl flags will have effect on linked-in libraries.
* Remove unused ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES.
BUG:
27614834
Change-Id: I4eda6003f1f24e498cba91c043dbe1fabe522686
Shinichiro Hamaji [Tue, 15 Mar 2016 23:00:11 +0000 (23:00 +0000)]
Merge "Replace last -includes by .KATI_DEPFILE"
Shinichiro Hamaji [Tue, 15 Mar 2016 21:40:04 +0000 (06:40 +0900)]
Replace last -includes by .KATI_DEPFILE
There was a typo in binary.mk. compile-dotdot-XXX-file in
definitions.mk was also using -include.
Bug:
26839129
Change-Id: I4a0145fb70413998cc65d30d2efcd68af07b4800
Tao Bao [Tue, 15 Mar 2016 20:20:19 +0000 (13:20 -0700)]
Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""
This CL fixes the bug in [1] (copy-paste error) and reenables it.
We need to handle a special case that an OTA goes from a source build
without OEM properties to a target build with those properties (or vice
versa). Add support in OTA scripts to deal the case properly, by a)
using two oem_props variables to handle source and target builds
respectively; b) adjusting the fingerprint/thumbprint assertions to
allow a mix of both.
[1] commit
c086370440bb32501da427718a7313f12ec2c841
Change-Id: I98118d77d5a0ff694fa1ee33602b5ee5e048599b
Tao Bao [Tue, 15 Mar 2016 19:16:32 +0000 (19:16 +0000)]
Merge "Revert "releasetools: Support OTAs that have OEM properties changes.""
Tao Bao [Tue, 15 Mar 2016 19:16:18 +0000 (19:16 +0000)]
Revert "releasetools: Support OTAs that have OEM properties changes."
Broke some builds.
This reverts commit
c086370440bb32501da427718a7313f12ec2c841.
Change-Id: If07006db412fea6c04f8698776a2ab418125a469
Tao Bao [Tue, 15 Mar 2016 18:33:20 +0000 (18:33 +0000)]
Merge "releasetools: Support OTAs that have OEM properties changes."
Sami Tolvanen [Tue, 15 Mar 2016 17:37:27 +0000 (17:37 +0000)]
Merge "Revert "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
Yohann Roussel [Tue, 15 Mar 2016 15:04:54 +0000 (15:04 +0000)]
Merge "Revert "Inform Jack of the min sdk""
Yohann Roussel [Tue, 15 Mar 2016 15:02:11 +0000 (15:02 +0000)]
Revert "Inform Jack of the min sdk"
This reverts commit
94451580af9c08e78ed347fb21b811049f8c96cb.
Bug:
27371864
Change-Id: I60a8c89b2ab8a6cbde4dd3b0aed24b71700815ab
Yohann Roussel [Tue, 15 Mar 2016 15:01:31 +0000 (15:01 +0000)]
Merge "Revert "Remove one debug line""
Yohann Roussel [Tue, 15 Mar 2016 14:51:28 +0000 (14:51 +0000)]
Revert "Remove one debug line"
This reverts commit
d2fafe57340fc2a8c4f13d579bf78d7f2667da32.
Change-Id: I8915604faafb21cf15c0f11ee8a770be2cfc9614
Yohann Roussel [Tue, 15 Mar 2016 13:52:46 +0000 (13:52 +0000)]
Merge "Remove one debug line"
Yohann Roussel [Tue, 15 Mar 2016 10:06:51 +0000 (11:06 +0100)]
Remove one debug line
Change-Id: I6de104dd2ca42404d45f3f4b91ccadd03d391f1c
Yohann Roussel [Tue, 15 Mar 2016 09:42:11 +0000 (09:42 +0000)]
Merge "Inform Jack of the min sdk"
Dan Willemsen [Thu, 10 Mar 2016 23:03:41 +0000 (15:03 -0800)]
Always run Soong
Without switching on USE_SOONG, this lets us verify that all builds have
blueprint/soong/go, and can generate a build.ninja file without
producing errors.
Change-Id: I79451ce24c8b5b6745e41d951153265441c33e8a
Shinichiro Hamaji [Mon, 14 Mar 2016 21:59:46 +0000 (21:59 +0000)]
Merge "Use KATI_DEPFILE for .P associated with object files"