OSDN Git Service
Daniel Micay [Wed, 16 Dec 2015 21:42:49 +0000 (16:42 -0500)]
set ro.adb.secure=1 for user builds
In user builds, adb without authentication is always disabled. However,
it doesn't work with the defaults because authentication doesn't work
without having ro.adb.secure=1 set. It makes sense to offer builds with
no adb but not builds with adb present in an unusable state (especially
as the default).
Bug:
22220212
Bug:
21862859
Change-Id: Ic22300a70586fd57692ac59d6873ab16dde70919
Neil Fuller [Thu, 17 Dec 2015 10:18:28 +0000 (10:18 +0000)]
Merge "Set -Xdoclint:none"
Dan Willemsen [Wed, 16 Dec 2015 23:30:40 +0000 (23:30 +0000)]
Merge "Define __BRILLO__ only for target modules"
Dan Willemsen [Wed, 16 Dec 2015 23:14:09 +0000 (23:14 +0000)]
Merge "Move __BRILLO__ to the core build system"
Dan Willemsen [Wed, 16 Dec 2015 23:04:51 +0000 (15:04 -0800)]
Define __BRILLO__ only for target modules
__ANDROID__ is only defined for target modules, do the same for
__BRILLO__.
Change-Id: Ie1417e1a5b21c051acf05b2bd3bdb3ddd31be878
Dan Willemsen [Wed, 16 Dec 2015 21:32:27 +0000 (13:32 -0800)]
Move __BRILLO__ to the core build system
In preparation for locking down COMMON_GLOBAL_CFLAGS.
Bug:
26165350
Change-Id: Ifdfb7808c1e1b624ffb0f99ab443ec2c5503a81c
Todd Poynor [Wed, 16 Dec 2015 22:12:53 +0000 (22:12 +0000)]
Merge "Make squashfs sparse image generation optional"
Ying Wang [Wed, 16 Dec 2015 21:42:07 +0000 (21:42 +0000)]
Merge "make USER limited to 6 characters when generating BUILD_NUMBER"
Narayan Kamath [Thu, 10 Dec 2015 22:24:39 +0000 (22:24 +0000)]
Set -Xdoclint:none
Mac builds use a javadoc tool that fails on more warnings than linux
builds. Add -Xdoclint:none to all java 8 standard doclet javadoc
commands.
Don't add it to javadoc commands that use the com.google.doclava.Doclava
doclet, it doesn't understand -Xdoclint:none.
(cherry-picked from commit
8bf7b5d51a6ff9a6d9b5cc5c21ecbf2ae5d0e804)
Change-Id: Ic5b8431ec2facb7989473b06ebe07246f6d2317f
Gina Dimino [Wed, 16 Dec 2015 18:49:42 +0000 (18:49 +0000)]
Merge "Docs: Replace custom search engine Bug:
25778395"
Gina Dimino [Mon, 14 Dec 2015 21:44:19 +0000 (13:44 -0800)]
Docs: Replace custom search engine
Bug:
25778395
Change-Id: I432698f63088a3e4ec285e46c7de2295c4cefad3
Than McIntosh [Wed, 16 Dec 2015 12:02:04 +0000 (12:02 +0000)]
Merge "Re-enable gold linker for aarch64."
weiqiao [Tue, 15 Dec 2015 07:57:22 +0000 (15:57 +0800)]
make USER limited to 6 characters when generating BUILD_NUMBER
BUILD_NUMBER is use to generate ro.build.description and
ro.build.display.id, if USER is long, these properties will
exceed 91 characters easily.
Change-Id: I7f99ef351f80210172a873104edd980b36c3f8f1
Signed-off-by: weiqiao <qiaowei224@gmail.com>
Todd Poynor [Wed, 16 Dec 2015 02:00:14 +0000 (18:00 -0800)]
Make squashfs sparse image generation optional
Allow non-sparse squashfs image generation, a la ext filesystems.
Bug:
26218766
Change-Id: Ifd596af16411e0cf69a2e7e05d725fd9442dc79c
Colin Cross [Wed, 16 Dec 2015 01:47:14 +0000 (01:47 +0000)]
Merge "Tell soong that it is embedded in a make build"
Dan Willemsen [Fri, 11 Dec 2015 21:50:00 +0000 (13:50 -0800)]
Tell soong that it is embedded in a make build
So that it can munge its ninja targets to not conflict with make.
Change-Id: I0c2273c0ca2fdfced1fa1590f2ea3eac8cddb905
Colin Cross [Wed, 16 Dec 2015 01:46:52 +0000 (01:46 +0000)]
Merge "Combine soong builds into make builds"
Colin Cross [Wed, 16 Dec 2015 00:56:08 +0000 (00:56 +0000)]
Merge "Remove unneccessary TARGET_BUILD_APPS conditional"
Colin Cross [Mon, 9 Nov 2015 22:53:36 +0000 (14:53 -0800)]
Combine soong builds into make builds
Bootstrap soong if necessary, and wrap the kati and soong ninja files
into a single ninja file.
Change-Id: I0000c7eaa1adda763189681c57ec27a97a12ee1f
Colin Cross [Thu, 3 Dec 2015 01:17:51 +0000 (17:17 -0800)]
Remove unneccessary TARGET_BUILD_APPS conditional
The prebuilt tools no longer conflict with the tools built from source,
remove the conditional.
Change-Id: Id334e25d9cfa2d5934450dd223bc9e30cd890062
Ying Wang [Tue, 15 Dec 2015 21:45:44 +0000 (21:45 +0000)]
Merge "Remove the prebuilt tools cleanstep logic."
Ying Wang [Tue, 15 Dec 2015 20:39:02 +0000 (12:39 -0800)]
Remove the prebuilt tools cleanstep logic.
We switched to running prebuilt host tools in place in
prebuilts/sdk/tools in TARGET_BUILD_APPS build. This logic is no longer
needed.
Change-Id: Ibf88b3c0a09fb3a1a04b25403457c48851ecc6f4
Ying Wang [Tue, 15 Dec 2015 18:56:39 +0000 (18:56 +0000)]
Merge "Disable .toc optimization for host modules."
Ying Wang [Tue, 15 Dec 2015 18:00:19 +0000 (10:00 -0800)]
Disable .toc optimization for host modules.
Host binaries may be run during the build process and the internal
implementation of the shared libraries makes a difference for the build
result. This change makes sure host tools get re-linked and re-run when
any of its dependency libraries gets updated.
DEX2OAT is such a host tool. We also changed DEX2OAT as full dependency
of dex-preoptimization, so we rebuild the odex files if DEX2OAT itself,
or any dependency libraries changed.
Bug:
24597504
Change-Id: Idf0d9be82ccebd826d9c5b405a39cff437e0af29
Than McIntosh [Tue, 15 Dec 2015 14:22:06 +0000 (09:22 -0500)]
Re-enable gold linker for aarch64.
Turn back on ld.gold and W-l,--icf=safe for
aarch64, now that the prebuilt ld.gold has been updated
with support for reloc 311/312 (fixed upstream, see
https://sourceware.org/bugzilla/show_bug.cgi?id=19042)
Bug:
25642296
Bug:
26153840
Change-Id: Idceb357a48d9da4eec38ab8f2103245d500622ae
Shinichiro Hamaji [Tue, 15 Dec 2015 06:27:31 +0000 (06:27 +0000)]
Merge "Reduce unnecessary rebuilds of .dex files with restat=1"
Elliott Hughes [Mon, 14 Dec 2015 22:48:38 +0000 (22:48 +0000)]
Merge "Turn on stack protector for mips64."
Elliott Hughes [Mon, 14 Dec 2015 22:46:38 +0000 (14:46 -0800)]
Turn on stack protector for mips64.
Go straight to -fstack-protector-strong, since it works to boot the emulator.
Change-Id: I2b65a0ab4426856ae05f66c1e294951e45bd72b6
Elliott Hughes [Mon, 14 Dec 2015 22:46:23 +0000 (22:46 +0000)]
Merge "Turn on stack protector for mips."
Elliott Hughes [Mon, 14 Dec 2015 22:15:12 +0000 (14:15 -0800)]
Turn on stack protector for mips.
Go straight to -fstack-protector-strong, since it works to boot the emulator.
Change-Id: Ie44abd869355d2163dec7d9e2635b26b45255df6
Elliott Hughes [Mon, 14 Dec 2015 21:45:40 +0000 (21:45 +0000)]
Merge "Enable -fstack-protector-strong for x86-64."
Elliott Hughes [Mon, 14 Dec 2015 21:41:58 +0000 (21:41 +0000)]
Merge "Be smarter about stack-protector on the host."
Elliott Hughes [Mon, 14 Dec 2015 21:20:59 +0000 (13:20 -0800)]
Be smarter about stack-protector on the host.
Some projects are still built with our host GCC 4.8, which doesn't
support -fstack-protector-strong. The combo .mk files are used by
GCC and clang, so it's not safe to turn on -fstack-protector-strong
there. Instead, do it in the clang-specific .mk for now.
We can clean this up when elfutils (the last code built for the host
with GCC that I'm aware of) is built by clang. We'll be able to
remove the host GCC prebuilts too!
Change-Id: I314b9eab071c132a8e2cb8cc779a75ae8abb12e2
Elliott Hughes [Mon, 14 Dec 2015 21:05:21 +0000 (21:05 +0000)]
Merge "Enable -fstack-protector-strong for x86."
Elliott Hughes [Mon, 14 Dec 2015 20:31:10 +0000 (20:31 +0000)]
Merge "Enable -fstack-protector-strong for the host."
Elliott Hughes [Mon, 14 Dec 2015 19:16:20 +0000 (11:16 -0800)]
Enable -fstack-protector-strong for x86-64.
This results in nearly all functions with the possibility of stack
corruption getting stack canaries, because it applies to any function
taking a reference to the frame or with a local array rather than just
the functions with arrays larger than 8 bytes. It was developed for use
in Chrome (and Chrome OS) and has also been adopted by various other
distributions (Arch, Fedora, Ubuntu, etc).
The code size increase ranges from ~1.5% to ~2.5%, compared to ~0.3% to
~0.7% with the more conservative switch. The increase in the performance
loss is usually minimal. The overall size increase once everything other
than C and C++ code is taken into account is minimal, and it greatly
improves the mitigation of stack buffer overflow vulnerabilities.
https://lwn.net/Articles/584225/
Change-Id: I3ce7a73c5cf36eba5c74df37367f3d3475b0a4ed
Elliott Hughes [Mon, 14 Dec 2015 19:15:15 +0000 (11:15 -0800)]
Enable -fstack-protector-strong for x86.
This results in nearly all functions with the possibility of stack
corruption getting stack canaries, because it applies to any function
taking a reference to the frame or with a local array rather than just
the functions with arrays larger than 8 bytes. It was developed for use
in Chrome (and Chrome OS) and has also been adopted by various other
distributions (Arch, Fedora, Ubuntu, etc).
The code size increase ranges from ~1.5% to ~2.5%, compared to ~0.3% to
~0.7% with the more conservative switch. The increase in the performance
loss is usually minimal. The overall size increase once everything other
than C and C++ code is taken into account is minimal, and it greatly
improves the mitigation of stack buffer overflow vulnerabilities.
https://lwn.net/Articles/584225/
Change-Id: I55a9fdbf5777ccdeed9f2e9a23c73bb94ad7b646
Elliott Hughes [Mon, 14 Dec 2015 19:14:21 +0000 (11:14 -0800)]
Enable -fstack-protector-strong for the host.
This results in nearly all functions with the possibility of stack
corruption getting stack canaries, because it applies to any function
taking a reference to the frame or with a local array rather than just
the functions with arrays larger than 8 bytes. It was developed for use
in Chrome (and Chrome OS) and has also been adopted by various other
distributions (Arch, Fedora, Ubuntu, etc).
The code size increase ranges from ~1.5% to ~2.5%, compared to ~0.3% to
~0.7% with the more conservative switch. The increase in the performance
loss is usually minimal. The overall size increase once everything other
than C and C++ code is taken into account is minimal, and it greatly
improves the mitigation of stack buffer overflow vulnerabilities.
https://lwn.net/Articles/584225/
Change-Id: I97a2187cebac64e3b9f22b691d4676b6da083ebd
Shinichiro Hamaji [Wed, 9 Dec 2015 09:06:20 +0000 (18:06 +0900)]
Reduce unnecessary rebuilds of .dex files with restat=1
The .dex.toc files are created by dexdump, which outputs all
information in a .dex file which may affect compilation of
other modules.
For prebuilt java libraries and static java libraries, we'll
output empty .toc files and don't set restat=1. .dex.toc files
are necessary even for static java libraries because they can
be referenced by LOCAL_JAVA_LIBRARIES (instead of
LOCAL_STATIC_JAVA_LIBRARIES).
We don't use this optimization for apps build. We cannot build
dexdump for apps build due to lack of libc++.
Performance:
$ m && touch \
frameworks/base/core/java/com/google/android/util/Procedure.java \
&& time m
Before: 3m48s
After: 1m46s
Bug:
24597504
Change-Id: Id1665923b414dee705dc60af4c021390a19ea26f
Stephen Hines [Sun, 13 Dec 2015 23:06:03 +0000 (23:06 +0000)]
Merge "Revert "Change USE_CLANG_PLATFORM_BUILD default to true.""
Stephen Hines [Sun, 13 Dec 2015 22:58:22 +0000 (22:58 +0000)]
Revert "Change USE_CLANG_PLATFORM_BUILD default to true."
This reverts commit
3c8036da538bbbf259ae4d56cc808943398cc45b.
Change-Id: I930bbebce8396d7c0abd847530640a696d3418e7
Nick Kralevich [Sat, 12 Dec 2015 01:07:07 +0000 (01:07 +0000)]
Merge "sepolicy: Fix 'avc denied' issues for the emulators"
Dan Albert [Sat, 12 Dec 2015 00:09:16 +0000 (00:09 +0000)]
Merge "Use lib64 for mips64 as well."
Dan Albert [Fri, 11 Dec 2015 20:49:18 +0000 (12:49 -0800)]
Use lib64 for mips64 as well.
This was previously working because for some reason prebuilts/ndk had
a tangled mess of hand assembled symlinks that pointed lib -> lib64
for the multilib architectures.
Change-Id: I294d67f58f2008b1a53790cf676f5223df449cbc
Dan Willemsen [Fri, 11 Dec 2015 20:58:03 +0000 (20:58 +0000)]
Merge "Enforce linker version-scripts are valid"
Alex Klyubin [Fri, 11 Dec 2015 18:29:36 +0000 (18:29 +0000)]
Merge "Make signapk use Conscrypt."
Chih-hung Hsieh [Fri, 11 Dec 2015 16:54:13 +0000 (16:54 +0000)]
Merge "Change USE_CLANG_PLATFORM_BUILD default to true."
Alex Klyubin [Thu, 10 Dec 2015 21:38:50 +0000 (13:38 -0800)]
Make signapk use Conscrypt.
This makes the signapk tool use Conscrypt (where possible) instead of
the platform-default JCA providers and the Bouncy Castle JCA provider.
This speeds up (by 10-30%) APK and OTA update signing because
Conscrypt's crypto primitives are backed by BoringSSL.
Previously, the signapk tool consisted only of the signapk.jar.
Because Conscrypt is backed by native code, signapk now consists of
signapk.jar and crypto_openjdk_jni shared library. This requires that
users of the tool be updated to provide a suitable -Djava.library.path
argument to the Java runtime. This change updates all known users of
the tool inside the Android source tree to do so.
Bug:
26097626
Change-Id: I8411b37d7f771ed99269751a3007dff103083552
Miroslav Tisma [Thu, 10 Dec 2015 11:23:40 +0000 (12:23 +0100)]
sepolicy: Fix 'avc denied' issues for the emulators
This commit fixes the avc denied issues in the emulators:
- goldfish_setup is granted for network access
- netd dontaudit for sys_module
- qemu_prop is granted domain for get_prop
Critical issue was that SELinux denied reading the lcd_density property
by SurfaceFlinger via qemu_prop and this commit fixes it.
Change-Id: I633d96f4d2ee6659f18482a53e21f816abde2a5f
Signed-off-by: Miroslav Tisma <miroslav.tisma@imgtec.com>
Chih-Hung Hsieh [Thu, 10 Dec 2015 22:13:43 +0000 (14:13 -0800)]
Change USE_CLANG_PLATFORM_BUILD default to true.
When USE_CLANG_PLATFORM_BUILD is not set, default will be clang/llvm.
USE_CLANG_PLATFORM_BUILD=false can be used to select gcc as default.
BUG:
23163853
BUG:
26102335
Change-Id: I00604c2aef4849e8c3505b2c4002eb1c46cd1fd1
Alex Deymo [Thu, 10 Dec 2015 22:18:34 +0000 (22:18 +0000)]
Merge "Rename libext2 host libraries to standard suffix."
Mike Frysinger [Thu, 10 Dec 2015 18:27:22 +0000 (18:27 +0000)]
Merge "sepolicy: drop -- marker"
Mike Frysinger [Thu, 10 Dec 2015 17:05:50 +0000 (12:05 -0500)]
sepolicy: drop -- marker
It's not needed and is a bit confusing.
BUG=
26018537
Change-Id: Ibb1c3995de97a442c95d5eea823523b5f0f26393
Alex Deymo [Thu, 10 Dec 2015 02:02:56 +0000 (18:02 -0800)]
Rename libext2 host libraries to standard suffix.
libext2_uuid_host was renamed to libext2_uuid-host to match the
"-host" suffix used in most libraries.
Bug:
24619596
TEST=make dist
Change-Id: Ic5faccb4d5fdbbf3d3bba6f4a35cf99d4961bb54
Dan Albert [Thu, 10 Dec 2015 00:28:25 +0000 (00:28 +0000)]
Merge "Fix the mips build."
Dan Albert [Thu, 10 Dec 2015 00:26:20 +0000 (16:26 -0800)]
Fix the mips build.
The linker can't do --hash-style=gnu for mips.
Change-Id: I66a77067f8be6fc92ca686d3e6e159beb72cf76b
Dan Albert [Thu, 10 Dec 2015 00:17:23 +0000 (00:17 +0000)]
Merge "Add support for LOCAL_NDK_STL_VARIANT := none."
Dan Albert [Wed, 9 Dec 2015 22:46:13 +0000 (14:46 -0800)]
Add support for LOCAL_NDK_STL_VARIANT := none.
Sometimes we don't want any STL.
Change-Id: I08b4389b7882702c0e483a1456f7775fe4da1c75
Dan Albert [Wed, 9 Dec 2015 23:41:01 +0000 (23:41 +0000)]
Merge "Build NDK binaries with --hash-style=both."
Dan Albert [Wed, 9 Dec 2015 22:52:25 +0000 (14:52 -0800)]
Build NDK binaries with --hash-style=both.
Change-Id: I1c3b7415c654b783c6bb7e38a40d4c279826400f
Alex Klyubin [Tue, 8 Dec 2015 20:15:11 +0000 (20:15 +0000)]
Merge "Do not run zipalign when re-signing APKs."
Alex Klyubin [Fri, 4 Dec 2015 17:21:08 +0000 (09:21 -0800)]
Do not run zipalign when re-signing APKs.
Running zipalign is no longer needed because signapk takes care of
alignment.
Bug:
25794543
Change-Id: I1080240a67ea6f1b41585fff83d18d57fdcf44e2
Ying Wang [Tue, 8 Dec 2015 17:59:55 +0000 (17:59 +0000)]
Merge "Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES"
am:
616b8a5370
* commit '
616b8a5370e6ad5cb8519fbe2c00eaa6637da260':
Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES
Ying Wang [Tue, 8 Dec 2015 17:56:05 +0000 (17:56 +0000)]
Merge "Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES"
Elliott Hughes [Tue, 8 Dec 2015 02:58:25 +0000 (18:58 -0800)]
Merge "Revert "enable -fstack-protector-strong""
am:
27ab42654e
* commit '
27ab42654ebd5ffdc55bb6b727723e6980649ef9':
Revert "enable -fstack-protector-strong"
Alex Klyubin [Tue, 8 Dec 2015 02:58:19 +0000 (18:58 -0800)]
Merge "Do not run zipalign when building APK (except prebuilts)."
am:
b437f58006
* commit '
b437f58006af3d8b15eb3308ab5174da1a7c6c0d':
Do not run zipalign when building APK (except prebuilts).
Ying Wang [Tue, 8 Dec 2015 02:58:12 +0000 (18:58 -0800)]
Merge "Fix TARGET_ASAN build."
am:
9bbc67b55a
* commit '
9bbc67b55ac6876920b3ca5a73673d0a10c3fb52':
Fix TARGET_ASAN build.
Dimitry Ivanov [Tue, 8 Dec 2015 02:58:05 +0000 (18:58 -0800)]
Merge "Include libGLESv3.so to PRODUCT_PACKAGES"
am:
73661d4220
* commit '
73661d4220b85987ee5e5f34a3fc538283c19c34':
Include libGLESv3.so to PRODUCT_PACKAGES
Elliott Hughes [Tue, 8 Dec 2015 02:54:01 +0000 (02:54 +0000)]
Merge "Revert "enable -fstack-protector-strong""
Elliott Hughes [Tue, 8 Dec 2015 02:53:51 +0000 (02:53 +0000)]
Revert "enable -fstack-protector-strong"
This reverts commit
8765b1035f813be2c26988a73cf3e9815aa5adf6.
This prevents x86 from booting.
http://b/
26046864
Change-Id: Ica3f7e7e639c99fd3158df3643acb49307197881
Ying Wang [Mon, 23 Nov 2015 22:57:26 +0000 (14:57 -0800)]
Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES
Without this if a Java libraryw with LOCAL_NO_STANDARD_LIBRARIES doesn't
have core-libart in its LOCAL_JAVA_LIBRARIES, it would use core-libart
as bootclasspath but without having dependency on it.
Change-Id: I611a5a5df2bf0ad59e0be50ed1ad1afe8b843e90
(cherry-pick from commit
c6a301756cd6bc58691cde69513b28e7ee0d1ac6)
Alex Klyubin [Mon, 7 Dec 2015 22:08:14 +0000 (22:08 +0000)]
Merge "Do not run zipalign when building APK (except prebuilts)."
Ying Wang [Mon, 7 Dec 2015 19:32:21 +0000 (19:32 +0000)]
Merge "Fix TARGET_ASAN build."
Dimitry Ivanov [Mon, 7 Dec 2015 19:00:58 +0000 (19:00 +0000)]
Merge "Include libGLESv3.so to PRODUCT_PACKAGES"
Ying Wang [Mon, 7 Dec 2015 18:45:19 +0000 (10:45 -0800)]
Fix TARGET_ASAN build.
Bug:
26044735
Change-Id: I9c6b3b16637ca2d0da4765e896a9f03c1d5dc51c
Nick Kralevich [Sat, 5 Dec 2015 22:23:57 +0000 (14:23 -0800)]
Merge "enable -fstack-protector-strong"
am:
2a49aba35b
* commit '
2a49aba35b9b9216df1da245f1af13c6faa5a850':
enable -fstack-protector-strong
Nick Kralevich [Sat, 5 Dec 2015 22:20:46 +0000 (22:20 +0000)]
Merge "enable -fstack-protector-strong"
Daniel Micay [Fri, 4 Dec 2015 22:36:26 +0000 (17:36 -0500)]
enable -fstack-protector-strong
This results in nearly all functions with the possibility of stack
corruption getting stack canaries, because it applies to any function
taking a reference to the frame or with a local array rather than just
the functions with arrays larger than 8 bytes. It was developed for use
in Chrome (and Chrome OS) and has also been adopted by various other
distributions (Arch, Fedora, Ubuntu, etc).
The code size increase ranges from ~1.5% to ~2.5%, compared to ~0.3% to
~0.7% with the more conservative switch. The increase in the performance
loss is usually minimal. The overall size increase once everything other
than C and C++ code is taken into account is minimal, and it greatly
improves the mitigation of stack buffer overflow vulnerabilities.
https://lwn.net/Articles/584225/
Change-Id: Ie83d381e09d94deb34c5ff142a101ba3d14cf3ba
Ying Wang [Sat, 5 Dec 2015 00:53:25 +0000 (00:53 +0000)]
Merge "Gmake doesn\'t like newline in macro expansion result."
am:
c7d5e54dfe
* commit '
c7d5e54dfe71766dc60adcf06e6ec1a2b12cdda9':
Gmake doesn't like newline in macro expansion result.
Ying Wang [Sat, 5 Dec 2015 00:49:46 +0000 (00:49 +0000)]
Merge "Gmake doesn't like newline in macro expansion result."
Ying Wang [Sat, 5 Dec 2015 00:44:03 +0000 (16:44 -0800)]
Gmake doesn't like newline in macro expansion result.
When $(call func) in the makefile text expansion includes newline, gmake
reports error "missing separator". But it's fine if the expansion includes
only spaces. That's a bit odd.
This change fixes the "missing separator".
Change-Id: I094e5ae1725699ebfa4ed66544eef037dd68714c
Dan Willemsen [Fri, 4 Dec 2015 23:17:58 +0000 (15:17 -0800)]
Merge "Sanity check LOCAL_SRC_FILES_EXCLUDE"
am:
cc3b2a5854
* commit '
cc3b2a58548832ab7a6620d6b607d315f06dfc06':
Sanity check LOCAL_SRC_FILES_EXCLUDE
Dan Willemsen [Fri, 4 Dec 2015 23:12:16 +0000 (23:12 +0000)]
Merge "Sanity check LOCAL_SRC_FILES_EXCLUDE"
Alex Klyubin [Fri, 4 Dec 2015 18:07:41 +0000 (10:07 -0800)]
Do not run zipalign when building APK (except prebuilts).
This changes the build system to no longer run zipalign except for
those prebuilts which do not need to re-signed.
Running zipalign is no longer needed because signapk takes care of
alignment. For those prebuilts which do not need to be re-signed
signapk is not invoked and thus zipalign is still needed because the
prebuilts may not have been aligned properly. This exemption will go
away once prebuilts are properly aligned.
Bug:
25794543
Change-Id: I31f10af80b9baa3c9481cb36f41e5e5046e852f9
Alex Klyubin [Fri, 4 Dec 2015 17:10:01 +0000 (17:10 +0000)]
Merge "Make signapk align .so entries to 4096 bytes."
am:
dbb5527a9e
* commit '
dbb5527a9ef27f292794d1e51ae56d1df68c328b':
Make signapk align .so entries to 4096 bytes.
Alex Klyubin [Fri, 4 Dec 2015 17:05:27 +0000 (17:05 +0000)]
Merge "Make signapk align .so entries to 4096 bytes."
Dan Willemsen [Fri, 4 Dec 2015 06:58:39 +0000 (22:58 -0800)]
Sanity check LOCAL_SRC_FILES_EXCLUDE
Error out if there is a file listed in LOCAL_SRC_FILES_EXCLUDE but not in
LOCAL_SRC_FILES. This should catch typos or other mistakes that would
otherwise be missed.
Change-Id: Iaddf575a6ce35238998ac47b59591a7d05fbcd0d
Colin Cross [Thu, 3 Dec 2015 21:56:25 +0000 (21:56 +0000)]
Merge "Remove extra definition of AIDL"
am:
77f411e116
* commit '
77f411e116981ae1de9f060b128e4df0b2facd57':
Remove extra definition of AIDL
Colin Cross [Thu, 3 Dec 2015 21:41:59 +0000 (21:41 +0000)]
Merge "Remove extra definition of AIDL"
Colin Cross [Thu, 3 Dec 2015 21:32:18 +0000 (13:32 -0800)]
Remove extra definition of AIDL
AIDL is defined in the sometimes-prebuilt tools section, remove the
extra definition that was overriding it.
Change-Id: I677bf46475fd5fd4a9258c77d91ecee806e5f205
Colin Cross [Thu, 3 Dec 2015 20:18:38 +0000 (20:18 +0000)]
Merge "Use prebuilt tools in place"
am:
50e0646dbe
* commit '
50e0646dbe1fb52918b38c75aefc49d24bfd9a24':
Use prebuilt tools in place
Colin Cross [Thu, 3 Dec 2015 20:12:48 +0000 (20:12 +0000)]
Merge "Use prebuilt tools in place"
Shinichiro Hamaji [Thu, 3 Dec 2015 05:42:52 +0000 (05:42 +0000)]
Merge "Remove warnings from ijar/classfile.cc"
am:
128053b91b
* commit '
128053b91b959d0664c33659063c5246eb57a594':
Remove warnings from ijar/classfile.cc
Shinichiro Hamaji [Thu, 3 Dec 2015 05:39:24 +0000 (05:39 +0000)]
Merge "Remove warnings from ijar/classfile.cc"
Dan Willemsen [Thu, 3 Dec 2015 03:19:04 +0000 (19:19 -0800)]
Enforce linker version-scripts are valid
Currently, if a version script is passed to the linker (using
-Wl,--version-script,...), it is used to limit symbol visibility and
assign symbol versions. But if a symbol is listed in the version script
but is not present in the binary, no error or warning is given.
Pass -Wl,--no-undefined-version to the linker so that it verifies all
(non-wildcard, C) entries in the version script match symbols in the
binary.
Change-Id: I65878931ab61124ae75e2c738cc733adfb107afc
Alex Klyubin [Thu, 3 Dec 2015 03:02:01 +0000 (19:02 -0800)]
Make signapk align .so entries to 4096 bytes.
This makes signapk align uncompressed .so entries to memory page
boundary (4096 bytes) to enable such libraries to be loaded at runtime
through memory-mapping the APK.
With this change in place, there should no longer be a need to run
zipalign after (or before) signapk.
Bug:
25794543
Change-Id: I74775af15a683791f57fcbd3497a79951b3f63a1
Tao Bao [Thu, 3 Dec 2015 01:30:40 +0000 (01:30 +0000)]
Merge "releasetools: Always use recovery mount options."
am:
643d466f7b
* commit '
643d466f7b853ab4009723e2da200e3a6642d2ad':
releasetools: Always use recovery mount options.
Tao Bao [Thu, 3 Dec 2015 01:24:15 +0000 (01:24 +0000)]
Merge "releasetools: Always use recovery mount options."
Colin Cross [Thu, 3 Dec 2015 01:13:57 +0000 (01:13 +0000)]
Merge "Provide path to mainDexClasses"
am:
62e99632c6
* commit '
62e99632c61ef74fb04cf2bf6e079844e5dd8ae1':
Provide path to mainDexClasses
Colin Cross [Thu, 3 Dec 2015 00:33:04 +0000 (16:33 -0800)]
Use prebuilt tools in place
Don't install the prebuilt SDK tools for TARGET_BUILD_APPS builds, just
execute them in place. Avoids issues with duplicate rules for the
prebuilts and source modules when building with TARGET_BUILD_APPS in a
full platform tree.
Change-Id: I3cdb4f1a8208e8750310a5cc6130657613b683d1