OSDN Git Service
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"
Shinichiro Hamaji [Mon, 14 Mar 2016 21:59:46 +0000 (21:59 +0000)]
Merge "Use KATI_DEPFILE for .P associated with object files"
Alex Klyubin [Mon, 14 Mar 2016 21:39:56 +0000 (21:39 +0000)]
Merge "Fix 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
Change-Id: I97199310d4b4451271a75bb6c6d0463e0b788be9
Dan Willemsen [Mon, 14 Mar 2016 19:35:43 +0000 (19:35 +0000)]
Merge "Handle out being a symlink"
Neil Fuller [Mon, 14 Mar 2016 14:34:05 +0000 (14:34 +0000)]
Merge "Make 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
(cherry-picked from commit
decb797276462feb4311b04e493da18f942b882f)
Change-Id: I0734b6e690bea32def3dc435c9ce0bd90b845e79
Dan Willemsen [Sat, 12 Mar 2016 00:11:25 +0000 (16:11 -0800)]
Handle out being a symlink
Soong needs to be able to reverse the relative path to out. Switch to
absolute paths if .. won't work because of out being a symlink to
somewhere else.
Bug:
27612837
Change-Id: Ib8b9e0f80523148cfd4b69a03d164578916d8fd5
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: Ieba0219494f29d2737d2ca234317c3af7e5e72c8
Sami Tolvanen [Fri, 11 Mar 2016 00:11:25 +0000 (00:11 +0000)]
Merge "Revert "build: pass version and patch level to mkbootimg""
Sami Tolvanen [Fri, 11 Mar 2016 00:08:57 +0000 (00:08 +0000)]
Revert "build: pass version and patch level to mkbootimg"
This reverts commit
8fb47f191f804d21e252ef7bb66886ea087c2d56.
Bug:
27580174
Change-Id: Id87fd1e8da217438757d5a0fa4bbef7aea6770fc
Stephen Hines [Thu, 10 Mar 2016 22:46:01 +0000 (22:46 +0000)]
Merge "Switch to clang-
2658975."
Dan Willemsen [Thu, 10 Mar 2016 07:22:37 +0000 (07:22 +0000)]
Merge "Use hermetic ckati/makeparallel prebuilts"
Ying Wang [Thu, 10 Mar 2016 02:09:59 +0000 (02:09 +0000)]
Merge "Turn 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
(cherry-pick from commit
401ffaeb7560fa088d540ed1c150c3f196ebf993)
Dan Willemsen [Tue, 8 Mar 2016 19:12:40 +0000 (11:12 -0800)]
Use hermetic ckati/makeparallel prebuilts
Currently, we're building against the native host version of libc++ and
other headers. Instead, use prebuilts of ckati/makeparallel built with
Soong against the included libc++ and sysroot. Building ckati /
makeparallel doesn't work well in unbundled branches that don't have all
of the libc++ dependencies to do successful host builds.
KATI is default variable defined when running under Kati, don't use it
for other purposes. Use CKATI instead.
Bug:
27533820
Change-Id: I82d66f5e34e3341a3cee4c5c83cd1d9a54d057ff
Todd Kennedy [Wed, 9 Mar 2016 20:54:22 +0000 (20:54 +0000)]
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED"
Dan Willemsen [Wed, 9 Mar 2016 20:27:57 +0000 (20:27 +0000)]
Merge "OSX: Use the oldest SDK, but always set our target to 10.8"
Dan Willemsen [Tue, 8 Mar 2016 23:20:30 +0000 (15:20 -0800)]
OSX: Use the oldest SDK, but always set our target to 10.8
Build binaries usable on older machines even if older SDKs are not
installed. Older SDKs can no longer be installed on newer Xcode
versions.
Change-Id: I0c9f2534466a127a19107820879c2856bfac0076
Dan Willemsen [Wed, 9 Mar 2016 18:31:17 +0000 (18:31 +0000)]
Merge changes I1fccee8d,Ib343df6d,I2f1984c2
* changes:
Fix C++ on Darwin
Remove support for /Developer
Remove support for Darwin 10.6 SDK
Dan Willemsen [Tue, 8 Mar 2016 23:25:02 +0000 (15:25 -0800)]
Fix C++ on Darwin
We've been including the system libc++ headers even if we're building
against our version of libc++. Stop doing that, and only add the headers
to our path if we're using the system libraries.
If nothing is specified, on recent OSX versions, libc++ is the default
c++ library instead of libstdc++. We've been explicitly including the
libc++ headers on all versions, but that breaks old versions. Force us
over to libc++, since the system libstdc++ does not support C++11, and
libc++ is still supported on our oldest version (10.8).
Change-Id: I1fccee8da0f425e10ccc9d3247ed40664eb6ada0
Tao Bao [Wed, 9 Mar 2016 03:26:19 +0000 (03:26 +0000)]
Merge "Use 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
Dan Willemsen [Tue, 8 Mar 2016 21:23:23 +0000 (13:23 -0800)]
Remove support for /Developer
/Developer was removed in Xcode 4.3. Our minimum SDK version is 10.8,
which implies at least Xcode 4.4, and our documentation requires
Xcode 4.5.2.
Change-Id: Ib343df6ded6e98222d8ee2e542e1f3fadd2b1397
Dan Willemsen [Tue, 8 Mar 2016 21:22:36 +0000 (13:22 -0800)]
Remove support for Darwin 10.6 SDK
Our minimum version is 10.8
Change-Id: I2f1984c2227861a3c784f2a5070853c2d1b250d6
Sami Tolvanen [Tue, 8 Mar 2016 16:08:14 +0000 (16:08 +0000)]
Merge "build: pass version and patch level to mkbootimg"
am:
b32d845090
* commit '
b32d845090d19d2dfbbf32d4628ef81478325927':
build: pass version and patch level to mkbootimg
Sami Tolvanen [Tue, 8 Mar 2016 16:02:24 +0000 (16:02 +0000)]
Merge "build: pass version and patch level to mkbootimg"
Dan Willemsen [Tue, 8 Mar 2016 00:16:45 +0000 (00:16 +0000)]
Merge "Reexport include dirs for whole static libs"
am:
e2379484ab
* commit '
e2379484ab96e7e5f9a60061557e492068ef1789':
Reexport include dirs for whole static libs
Dan Willemsen [Tue, 8 Mar 2016 00:14:02 +0000 (00:14 +0000)]
Merge "Reexport include dirs for whole static libs"
Martin Blumenstingl [Tue, 8 Mar 2016 00:05:12 +0000 (00:05 +0000)]
Merge "Removed duplicate definition of E2FSCK"
am:
d7a4e56a87
* commit '
d7a4e56a87c324378e60f5989a14a5d5addfd456':
Removed duplicate definition of E2FSCK
Colin Cross [Mon, 7 Mar 2016 23:54:40 +0000 (23:54 +0000)]
Merge "Removed duplicate definition of E2FSCK"
Tao Bao [Mon, 7 Mar 2016 22:35:40 +0000 (22:35 +0000)]
Merge "releasetools: Fix the bug in AssertSequenceGood."
am:
236e664efa
* commit '
236e664efa04bd92ce28ba553afebf8e79ca17fa':
releasetools: Fix the bug in AssertSequenceGood.
Tao Bao [Mon, 7 Mar 2016 22:25:02 +0000 (22:25 +0000)]
Merge "releasetools: Fix the bug in AssertSequenceGood."
Elliott Hughes [Mon, 7 Mar 2016 22:17:37 +0000 (22:17 +0000)]
Merge "Use ulimit -p rather than prlimit."
am:
74d4d98be1
* commit '
74d4d98be1156982a1ab9a26be1dac26ee4e51d1':
Use ulimit -p rather than prlimit.
Elliott Hughes [Mon, 7 Mar 2016 22:10:44 +0000 (22:10 +0000)]
Merge "Use ulimit -p rather than prlimit."
Elliott Hughes [Mon, 7 Mar 2016 21:53:53 +0000 (13:53 -0800)]
Use ulimit -p rather than prlimit.
Neither is standard, but ulimit is toybox and therefore a bit more
regular and at least has help text.
Change-Id: Id7ba9adc9ca256b821d8060506010abef30dee28
Elliott Hughes [Mon, 7 Mar 2016 21:22:53 +0000 (21:22 +0000)]
Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark."
am:
ef0c20621d
* commit '
ef0c20621d7b82f25f8fa669a0b2d8031588169d':
Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark.
Elliott Hughes [Mon, 7 Mar 2016 21:17:45 +0000 (21:17 +0000)]
Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark."
Ying Wang [Mon, 7 Mar 2016 20:04:13 +0000 (20:04 +0000)]
Merge "Fix dumping variables of absolute paths."
am:
dd70b91060
* commit '
dd70b9106079f39738c129c6f874576748f92d3e':
Fix dumping variables of absolute paths.
Ying Wang [Mon, 7 Mar 2016 19:58:14 +0000 (19:58 +0000)]
Merge "Fix dumping variables of absolute paths."
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
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
Martin Blumenstingl [Sun, 6 Mar 2016 21:38:19 +0000 (22:38 +0100)]
Removed duplicate definition of E2FSCK
Change-Id: I810711ad05e198ee1f9606c37649e80df7b55fa5
Ying Wang [Sat, 5 Mar 2016 00:32:27 +0000 (00:32 +0000)]
Merge "Delete relics left behind by commit
86e6b7ed51dab3e ."
am:
880c9ffe7a
* commit '
880c9ffe7a47c163f986f7bc02963bbde1c83c0f':
Delete relics left behind by commit
86e6b7ed51dab3e .
Ying Wang [Sat, 5 Mar 2016 00:29:00 +0000 (00:29 +0000)]
Merge "Delete relics left behind by commit
86e6b7ed51dab3e ."
Ying Wang [Sat, 5 Mar 2016 00:24:36 +0000 (16:24 -0800)]
Delete relics left behind by commit
86e6b7ed51dab3e .
Change-Id: I81febc28f471727fc37335b11e47749753a57997
(cherry-pick from commit
0f59fdf30db2209cf30ea042d86ef60dcf807838)
Dan Willemsen [Fri, 4 Mar 2016 23:55:48 +0000 (23:55 +0000)]
Merge "Tell soong about MALLOC_SVELTE"
am:
fd2691c35f
* commit '
fd2691c35f6e0c7b5339befa8afefaebdfb72283':
Tell soong about MALLOC_SVELTE
Dan Willemsen [Fri, 4 Mar 2016 23:53:36 +0000 (23:53 +0000)]
Merge "Tell soong about MALLOC_SVELTE"
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.
Change-Id: I3a77292da673c813bd20d8dc177ff36419d8ecae
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.
Change-Id: I24966bf1ff84305df3586ab01d1aae7d5922aa11
Dan Albert [Fri, 4 Mar 2016 22:34:39 +0000 (22:34 +0000)]
Merge "Get gtest includes from the exported headers."
am:
f8b170dc52
* commit '
f8b170dc52575f16a63bfd6b6710efb46580c8b2':
Get gtest includes from the exported headers.
Dan Albert [Fri, 4 Mar 2016 22:30:58 +0000 (22:30 +0000)]
Merge "Get gtest includes from the exported headers."
Ying Wang [Fri, 4 Mar 2016 22:10:23 +0000 (22:10 +0000)]
Merge "Small fixes."
am:
dfa0d1063a
* commit '
dfa0d1063a8b07c22d79116be799ffda537211e8':
Small fixes.
Ying Wang [Fri, 4 Mar 2016 21:58:08 +0000 (21:58 +0000)]
Merge "Small fixes."
Ying Wang [Fri, 4 Mar 2016 21:56:23 +0000 (13:56 -0800)]
Small fixes.
Change-Id: Ia949ed0bc93edb78d0b029f3bd3dd584e9a00dc8
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
Change-Id: I1565cf680298a1765e88162d8b0e59dedba29bd7
Dan Willemsen [Fri, 4 Mar 2016 20:59:24 +0000 (20:59 +0000)]
Merge "Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S"
am:
6d813d8c92
* commit '
6d813d8c9223ba6e55e98f23a8a8c2248466feff':
Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S
Dan Willemsen [Fri, 4 Mar 2016 20:52:57 +0000 (20:52 +0000)]
Merge "Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S"
Dan Willemsen [Fri, 4 Mar 2016 20:40:25 +0000 (12:40 -0800)]
Reexport include dirs for whole static libs
When a static library uses LOCAL_EXPORT_C_INCLUDE_DIRS, then is included
entirely in another library with LOCAL_WHOLE_STATIC_LIBRARIES, all the
symbols are reexported, so reexport the headers too.
Change-Id: I92cf17894fc991a5b5ecb59ca5e095e407c98de4
Tao Bao [Fri, 4 Mar 2016 19:30:01 +0000 (19:30 +0000)]
Merge "releasetools: Fix one missing case for --oem_no_mount."
am:
4e677900f7
* commit '
4e677900f7b0017fcd926dc66d778e355e6a1bae':
releasetools: Fix one missing case for --oem_no_mount.
Tao Bao [Fri, 4 Mar 2016 19:20:15 +0000 (19:20 +0000)]
Merge "releasetools: Fix one missing case for --oem_no_mount."
Ying Wang [Fri, 4 Mar 2016 19:06:53 +0000 (19:06 +0000)]
Merge "Speed up lunch/tapas/etc. shell utility functions."
am:
d3c08f8b76
* commit '
d3c08f8b763c1d8f865896cf7d03d1794bdd14fe':
Speed up lunch/tapas/etc. shell utility functions.
Ying Wang [Fri, 4 Mar 2016 19:03:56 +0000 (19:03 +0000)]
Merge "Speed 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
Change-Id: I24e88598f6fab598ef26518885fd5e86e71a772d
Ying Wang [Fri, 4 Mar 2016 18:54:25 +0000 (18:54 +0000)]
Merge "Align up java-lib-files and java-lib-deps."
am:
58b8c86f84
* commit '
58b8c86f84ad0bf8fb3bb7dfc259fd1e3ce0dae1':
Align up java-lib-files and java-lib-deps.
Ying Wang [Fri, 4 Mar 2016 18:40:05 +0000 (18:40 +0000)]
Merge "Align 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
(cherry-pick from commit
063d0455e0f3a14f2577a26715f82e0bf3e79ee9)
Tao Bao [Fri, 4 Mar 2016 17:45:03 +0000 (09:45 -0800)]
releasetools: Fix one missing case for --oem_no_mount.
The CL in [1] added support for --oem_no_mount. It missed one place that
guards the OEM mounting.
[1] commit
8608cde944d64dece63e8c770deb78c1d092c719
Change-Id: I6ecaa94cd0866e0fd4fc88cb0aa3ebf55cde2968
Neil Fuller [Fri, 4 Mar 2016 13:09:22 +0000 (13:09 +0000)]
Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY"
am:
b97ce3bb61
* commit '
b97ce3bb613c1ea18c9aea42e829ac34039b7679':
Add JarJar support to BUILD_HOST_JAVA_LIBRARY
Neil Fuller [Fri, 4 Mar 2016 12:58:44 +0000 (12:58 +0000)]
Merge "Add 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
(cherry picked from commit
30b21ad579fab9669ec00845bfa092e4318eed10)
Change-Id: I4f16896606bcfdd00164078eeb142d05b29bb832
Dan Willemsen [Fri, 4 Mar 2016 01:37:50 +0000 (17:37 -0800)]
Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S
Target assembly files do not get these cflags, align the host
definitions to do the same.
Change-Id: Idadfa1f367c3ebea44460c5798225a85dd319371
Yabin Cui [Thu, 3 Mar 2016 19:02:56 +0000 (19:02 +0000)]
Merge "Enable LOCAL_POST_LINK_CMD for non-static executables."
am:
1f310530fc
* commit '
1f310530fcd3c15b0d5d2b067d1ad320bc4faef2':
Enable LOCAL_POST_LINK_CMD for non-static executables.
Yabin Cui [Thu, 3 Mar 2016 18:59:38 +0000 (18:59 +0000)]
Merge "Enable LOCAL_POST_LINK_CMD for non-static executables."
Shinichiro Hamaji [Thu, 3 Mar 2016 09:12:52 +0000 (18:12 +0900)]
Use KATI_DEPFILE for .P associated with object files
Also specify "-d keepdepfile" to ninja so .P files won't be
deleted by ninja.
-include for .s files are removed because GCC doesn't
generate .d files for .s files.
Bug:
26839129
Change-Id: If00e93c7a33449ec314a5cdba438475a32979f4e
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
Dan Albert [Wed, 2 Mar 2016 21:05:46 +0000 (13:05 -0800)]
Get gtest includes from the exported headers.
Change-Id: I47db781a36318664fabff8a5e75031c6bee674e4
Ying Wang [Wed, 2 Mar 2016 19:21:23 +0000 (19:21 +0000)]
Merge "Clean generated source dir if .proto/.rs is gonee."
am:
591fa1284a
* commit '
591fa1284aa29ec8b2ff8917ce86f81c5b14ad0a':
Clean generated source dir if .proto/.rs is gonee.
Ying Wang [Wed, 2 Mar 2016 19:21:12 +0000 (19:21 +0000)]
Merge "Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS"
am:
de9e5d40ef
* commit '
de9e5d40ef8d9433ad22bb41fa428c7cec5e1549':
Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS
Ying Wang [Wed, 2 Mar 2016 19:01:28 +0000 (19:01 +0000)]
Merge "Clean generated source dir if .proto/.rs is gonee."
Ying Wang [Wed, 2 Mar 2016 19:01:24 +0000 (19:01 +0000)]
Merge "Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS"
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
(cherry-pick from commit
d5ffec938344defd437d8e315d6a3376b1100a5a)
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
(cherry-pick from commit
b6eb8ddbde11de0bc59cfedf7adb91a83c27d279)
Dan Willemsen [Wed, 2 Mar 2016 18:25:58 +0000 (18:25 +0000)]
Merge "Ensure prebuilt executables are executable"
am:
c92dc59c86
* commit '
c92dc59c86f09526735625c605b8e7ded1070e90':
Ensure prebuilt executables are executable
Dan Willemsen [Wed, 2 Mar 2016 18:12:06 +0000 (18:12 +0000)]
Merge "Ensure prebuilt executables are executable"
Yohann Roussel [Wed, 2 Mar 2016 09:04:20 +0000 (09:04 +0000)]
Merge "Use Jack to check build"
am:
6a9d0f9718
* commit '
6a9d0f9718f127475d702ae6831a2bec3be976b6':
Use Jack to check build
Yohann Roussel [Wed, 2 Mar 2016 08:46:24 +0000 (08:46 +0000)]
Merge "Use Jack to check build"
Dan Willemsen [Wed, 2 Mar 2016 06:04:57 +0000 (22:04 -0800)]
Ensure prebuilt executables are executable
Use 'chmod +x' to make sure that they're executable, even if the source
file is not.
Change-Id: Id155f6b4ff188f5c909fd6237fd64183af264f79
Dan Willemsen [Tue, 1 Mar 2016 23:21:15 +0000 (15:21 -0800)]
Tell soong about MALLOC_SVELTE
Change-Id: I50ce6c0767db8963a7a633bdb349db1c96427cd8
Dan Willemsen [Tue, 1 Mar 2016 23:19:33 +0000 (23:19 +0000)]
Merge changes I12810c1b,I62287a80,Ied96fdc3
am:
a65b01fc09
* commit '
a65b01fc09b47c83e59dc4757c76eafba1e15cbc':
Remove LOCAL_ACP_UNAVAILABLE
Remove unused dependencies on $(ACP)
Replace some uses of acp with cp
Dan Willemsen [Tue, 1 Mar 2016 23:18:27 +0000 (23:18 +0000)]
Merge changes I12810c1b,I62287a80,Ied96fdc3
* changes:
Remove LOCAL_ACP_UNAVAILABLE
Remove unused dependencies on $(ACP)
Replace some uses of acp with cp
Ari Hausman-Cohen [Tue, 1 Mar 2016 22:45:24 +0000 (22:45 +0000)]
Merge "Adding a brillo_tests task."
am:
3bbaa8a8ff
* commit '
3bbaa8a8ffe18a2afc3d9d2ee36dfcf74775aba8':
Adding a brillo_tests task.
Ari Hausman-Cohen [Tue, 1 Mar 2016 22:38:07 +0000 (22:38 +0000)]
Merge "Adding a brillo_tests task."
Dan Willemsen [Mon, 29 Feb 2016 21:20:29 +0000 (13:20 -0800)]
Remove LOCAL_ACP_UNAVAILABLE
Now that copy-file-to-target doesn't use acp, nothing in the acp build
path uses acp, so we don't need to special case it to prevent loops.
Change-Id: I12810c1b064d0c03135a80077a76bc4c9cc18b24
Dan Willemsen [Tue, 1 Mar 2016 01:52:39 +0000 (17:52 -0800)]
Remove unused dependencies on $(ACP)
Most of these are calling to copy-file-to-target or similar, which no
longer use $(ACP).
Change-Id: I62287a80c577c34df587b74e70055c2f56050ce7
Dan Willemsen [Mon, 29 Feb 2016 20:45:18 +0000 (12:45 -0800)]
Replace some uses of acp with cp
ACP was originally created to overcome differences with cp between
Linux, Darwin, and Windows. We've since dropped Windows as a build host,
and don't use features like '-u' anymore.
For most of our current usecases, 'acp' is identical to 'cp' except that
it splits 'cp -p' into 'acp -p' for mode and ownership, and 'acp -t' for
timestamps. On Linux, this could be specified using
'--preserve=mode,ownership', but Darwin doesn't have this.
Since we're removing the destination file before copying, 'cp' already
preserves the mode (modulated by the umask). So the only extra thing
that gets preserved with 'acp -p' is ownership, which we should not care
about in the build system. (In many cases we shouldn't be preserving
mode either, so that readonly source trees can actually be marked
readonly, but that will be a future change)
Change-Id: Ied96fdc303ac5c774347c07363daec8b6dfb22e4