Commit graph

4237 commits

Author SHA1 Message Date
Dmitriy Ivanov
caabca3786 am 5caca89c: Merge "Clarify multiarch warnings"
* commit '5caca89c5d66e9999e26905522bf2eed958d0961':
  Clarify multiarch warnings
2014-05-22 01:24:48 +00:00
Dmitriy Ivanov
38bba065e0 Clarify multiarch warnings
* Show multiarch related warnings only if my_module_multilib is both

Change-Id: If0c467c1d9b953bd3f40949ab4b97d9329ec021f
2014-05-21 16:40:35 -07:00
Ying Wang
36142f64ae Split the rules to build the odex file
Previously the odex file is byproduct generated by the package.apk rule.
Though we have the odex file depend on the package.apk it doesn't have
its own build recipe. In case package.apk isn't updated but we still
need to update the odex file (such as changed LOCAL_MULTILIB), the odex
file will never be rebuilt.
This change split out the rules to build the odex file and make sure the
build recipe get executed if the odex file needs rebuild.

Change-Id: I60c2f32b536b3d59045301ee863aae1451734aad
2014-05-21 16:24:59 -07:00
Ying Wang
8a724260f2 am 4e151105: Merge "Support to extract JNI libs from prebuilt APK"
* commit '4e151105a02ba09acb277c6a084252d01c561a5f':
  Support to extract JNI libs from prebuilt APK
2014-05-21 01:06:03 +00:00
Ying Wang
966c1e0cae Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
We already support pure 32-bit and 64-bit-by-default multilib build.
With HOST_PREFER_32_BIT we can build 32-bit-by-default multilib build.
This will be lest disruptive during the period we transition to
64-bit-by-default.

Bug: 13751317
Change-Id: I0d56ce4abbe4afeaacfd70d709f6a349791c0722
2014-05-20 18:03:21 -07:00
Ying Wang
7cf9f28b5f Support to extract JNI libs from prebuilt APK
Use LOCAL_PREBUILT_JNI_LIBS to install prebuilt JNI libraries extracted
from the prebuilt apk, or prebuilts as source, to the app specific lib path.
LOCAL_PREBUILT_JNI_LIBS accepts 2 kinds of files:
- Files like @path/to/libfoo.so (path inside the apk) are JNI libs
  extracted from the prebuilt apk. In this case, all embedded JNI libs
  inside the prebuilt apk are stripped.
- Files like path/to/libfoo.so (path relative to LOCAL_PATH) are
  prebuilts in the source tree.

Those prebuilt JNI libs are not defined as modules in the build system,
so this works around possible module name conflict.

Bug: 13170859
Change-Id: I91bb844cc11b3621a85733bc7e8910f168957ef0
2014-05-20 18:02:17 -07:00
Ben Cheng
50e9911179 am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"
* commit '54bea362ab7f33791bd6ea54d77a76dc8d9e005d':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
2014-05-20 16:04:17 +00:00
Ben Cheng
54bea362ab Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)" 2014-05-20 16:00:08 +00:00
Ben Cheng
d033121431 Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7

NDK libraries are still picked up from prebuilts/ndk/*/4.8/*

GCC has been patched to disable codegen for calling
__cxa_throw_bad_array_new_length.

Source code has been sync'ed against the 2014-05-14 snapshot which
contains many important fixes (devirtualization, codegen, ...).

Change-Id: I43229360ad0132193d5208cb0d1acba55084853c
2014-05-19 16:22:21 -07:00
Brian Carlstrom
a8355ecaad am 64f3a191: Merge "Multilib support for odex"
* commit '64f3a191f92a6ab84a8175ad480633b8c58ac900':
  Multilib support for odex
2014-05-19 16:53:35 +00:00
Brian Carlstrom
64f3a191f9 Merge "Multilib support for odex" 2014-05-19 16:50:17 +00:00
Ying Wang
b9aa5d43de Multilib support for odex
If the VM is libart and DEXPREOPT is enabled,
- For a Java library and the boot image, we build for both 1st arch and
  2nd arch.
- For an app, we build for the multilib arch the module is targeted for.
The odex file will be in <arch_name>/<module_name>.odex inside the same
dir where the jar/apk file gets installed.
Nothing changed if it's built for libdvm.

Bug: 14694978
Change-Id: I45118a83758b41d52d6c9e38f93f0ba2775a6c74
2014-05-18 22:04:58 -07:00
Ying Wang
002f3c2862 am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"
* commit '4636abe5899272e1e9051e2c98516409107c4e8c':
  Real "LOCAL_MULTILIB := both" for prebuilts
2014-05-17 03:06:42 +00:00
Ying Wang
4636abe589 Merge "Real "LOCAL_MULTILIB := both" for prebuilts" 2014-05-17 03:03:44 +00:00
Ying Wang
023209b63e am 5ee3f096: Merge "Default TARGET_CPU_SMP to true."
* commit '5ee3f0960dbc6a14333e3b98252d59f5d8d18a7d':
  Default TARGET_CPU_SMP to true.
2014-05-17 00:09:03 +00:00
Ying Wang
d450706704 Default TARGET_CPU_SMP to true.
Change-Id: If8c52c8ed66d52452967d09885dfe1ca9da13688
2014-05-16 16:27:11 -07:00
Ying Wang
112786266a am 3c8089ce: Merge "Fix the missing 2nd arch prefix."
* commit '3c8089cef8eaf90b11852a5c258eba0ff5e3287e':
  Fix the missing 2nd arch prefix.
2014-05-16 23:26:31 +00:00
Ying Wang
ef773d22ca Fix the missing 2nd arch prefix.
Bug: 13751317
Change-Id: Ie5a323a0a89245576dbc91271d3178574942627d
2014-05-16 16:22:32 -07:00
Dan Albert
304a7a9fab am b589679b: Merge "Use libc++ versions of gtest libs when needed"
* commit 'b589679b101e0863a1fd1d7f4fc6ee3370c8a60a':
  Use libc++ versions of gtest libs when needed
2014-05-16 22:03:56 +00:00
Dan Albert
9b0c6ff69c Use libc++ versions of gtest libs when needed
Change-Id: Id8752ea946cbaa747dfa4fccf38d680dfeee5b45
2014-05-16 14:55:50 -07:00
Dan Albert
4dd8c9705d am a82b32a7: Merge "Use libc++ versions of gtest libs when needed"
* commit 'a82b32a7a7855cb93e11e060120803e91cc81c2d':
  Use libc++ versions of gtest libs when needed
2014-05-16 21:54:04 +00:00
Dan Albert
a82b32a7a7 Merge "Use libc++ versions of gtest libs when needed" 2014-05-16 21:50:27 +00:00
Ying Wang
47316a27ea am 5137d458: Merge "Force to build llvm from source in 64-bit host build."
* commit '5137d4584e60dea68715dbcae5e276b3af965460':
  Force to build llvm from source in 64-bit host build.
2014-05-16 18:59:23 +00:00
Dan Albert
965bfefb6b Use libc++ versions of gtest libs when needed
Change-Id: I19aa58a83a9da680d441af5f3956a2fbdf18c4e4
2014-05-16 11:22:44 -07:00
Ying Wang
34d5f1b27e Real "LOCAL_MULTILIB := both" for prebuilts
This uses the fact that unsetting LOCAL_MULTILIB equals "either".
It's useful to build for both 32-bit and 64-bit in the same prebuilt
module definition.

Bug: 13751317
Change-Id: I4f1625a83e13f22f807039afebae73f69ed35918
2014-05-16 10:49:57 -07:00
Ying Wang
6374153fbf Force to build llvm from source in 64-bit host build.
Bug: 13751317
Change-Id: I4a4150bfe21607eb7a2342bbd8120b431427eee5
2014-05-16 09:37:23 -07:00
Ji-Hwan Lee
eaf4c7581f am a7748859: Merge "Clear *.ini and skin directory on installclean"
* commit 'a7748859d741af2f7e22f3333030b937269d33c7':
  Clear *.ini and skin directory on installclean
2014-05-16 01:57:35 +00:00
Ji-Hwan Lee
a7748859d7 Merge "Clear *.ini and skin directory on installclean" 2014-05-16 01:54:49 +00:00
Ying Wang
5b768a7253 am f14653ce: Merge "x86_common.mk has been replaced by HOST_x86_common.mk"
* commit 'f14653cee4c98094d171c194b1af3e14b087ab09':
  x86_common.mk has been replaced by HOST_x86_common.mk
2014-05-16 01:54:12 +00:00
Ying Wang
a303c4f546 x86_common.mk has been replaced by HOST_x86_common.mk
Change-Id: I19eea82bb35d3f65a2d894c687131a1eafbe2cc9
2014-05-15 18:50:06 -07:00
Christopher Ferris
7c67257b8e am f8cfbc0a: Merge "Print all 2ND variables."
* commit 'f8cfbc0a10b75e6ec22b6e80b90df2a4386887b2':
  Print all 2ND variables.
2014-05-16 01:17:13 +00:00
Christopher Ferris
f8cfbc0a10 Merge "Print all 2ND variables." 2014-05-16 01:14:43 +00:00
Ji-Hwan Lee
0a5b178fc3 Clear *.ini and skin directory on installclean
Currently, skin directory remains across different emulator targets, and
need manual removal.  Also, clear hardware-qemu.ini and config.ini.
(See https://android-review.googlesource.com/94692 for config.ini)

Change-Id: Iaa5849ad043ed3f317325ba1d6df287953636f7a
2014-05-15 20:59:01 +09:00
Narayan Kamath
59f04e889e am 944a3810: Merge "Fix executable symlinks."
* commit '944a38104a553d84c44fa87b2378ebee66a12349':
  Fix executable symlinks.
2014-05-15 09:41:37 +00:00
Narayan Kamath
944a38104a Merge "Fix executable symlinks." 2014-05-15 09:36:26 +00:00
Christopher Ferris
4fe22ae9e8 Print all 2ND variables.
Change-Id: I11180a3ec3481d293100c59c331f05db9e6a689b
2014-05-14 19:16:25 -07:00
Ying Wang
40b49d3043 am a74ade94: Merge "Support host multilib build"
* commit 'a74ade945776e80f99f3b05d06a131cfd353c3f6':
  Support host multilib build
2014-05-15 00:41:37 +00:00
Ying Wang
6feb6d5607 Support host multilib build
This change basically ported our target multilib to the host side.
It supports 2 host build modes: x86 and x86_64 multilib build.
For now you need to set "BUILD_HOST_64bit=true" to switch to x86_64
multilib build. Later we'll default to x86_64 build and have a flag
to force 32-bit only build, which may be needed by SDK build.

In host module definition, like in target ones, you can use the
following
LOCAL variables to set up multilib configuration:
LOCAL_MULTILIB: can be "both", "first", "32" or "64".
It also supports the same set of arch or 32-vs-64 specific LOCAL
variables.
By default, it builds only for the first arch.

To keep path compatibility, in x86_64 build files are still output to
out/host/linux-x86; Both 32-bit and 64-bit executables are in
out/host/linux-86/bin;
In x86_64 build 32-bit shared libraries are installed to
out/host/linux-x86/lib32
and 64-bit shared libraries are installed to out/host/linux-x86/lib;
32-bit object files are output to out/host/linux-x86/obj32 and 64-bit
object files
are output to out/host/linux-x86/obj.

Bug: 13751317
Change-Id: I6044f83b7db369a33e05209e8c588eb6dc83409f
2014-05-14 16:55:04 -07:00
Narayan Kamath
4fb8122bcb Fix executable symlinks.
32 bit targets will leave TARGET_PREFER_{32,64}_BIT_APPS unset
so adjust accordingly. Also clean up an explanatory comment.

Change-Id: I1f6faa640e4e862631fff49f7c565766ef2c567f
2014-05-14 18:26:48 +01:00
Ying Wang
72344a7329 am 8012d8f3: Merge "Treat denver like cortex-a15."
* commit '8012d8f353304ef4487545648455d34d6ffc2741':
  Treat denver like cortex-a15.
2014-05-13 16:34:00 +00:00
Ying Wang
fb910ddb1d Treat denver like cortex-a15.
See also build/core/combo/arch/arm/armv7-a-neon.mk.

Change-Id: Ie18e1f133f56a9f7da80e304052c92edad933a31
2014-05-13 09:02:56 -07:00
Andrew Hsieh
e7b99aec67 am fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
* commit 'fb1f38ecbacfb5dc2cc4f3f83eb814ac2aa090ca':
  Define __USE_MINGW_ANSI_STDIO for windows build
2014-05-13 00:57:08 +00:00
Andrew Hsieh
fb1f38ecba Merge "Define __USE_MINGW_ANSI_STDIO for windows build" 2014-05-13 00:53:45 +00:00
Ian Rogers
50912342f1 am f544a5f4: Merge "Place ISA in ART boot image name."
* commit 'f544a5f4d57750b569333a59d57f568121f6f4a3':
  Place ISA in ART boot image name.
2014-05-12 23:00:45 +00:00
Ian Rogers
334497b8b6 Place ISA in ART boot image name.
Depends upon:
https://android-review.googlesource.com/#/c/94096/2

Change-Id: I79bec60a17ea7cf9214e56f8035d4a1b80b0eeb6
2014-05-12 15:17:25 -07:00
Ying Wang
6c43294059 am dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
* commit 'dcdc985c47338c29e66a22941904abd4171607c9':
  executable_prefer_symlink: add makefile for creating symlink to prefer version
2014-05-12 16:53:01 +00:00
Ying Wang
dcdc985c47 Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version" 2014-05-12 16:49:16 +00:00
Bernhard Rosenkraenzer
d6e11825c4 Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
Add some more gcc specific flags that are used somewhere in the tree
(e.g. external/chromium_org) to CLANG_CONFIG_UNKNOWN_CFLAGS

Change-Id: Icc572fdb6ea4ba818c4d18e430296589eb61bf55
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2014-05-12 16:05:14 +02:00
David 'Digit' Turner
9e3259f50d am fb67f05d: Merge changes I53b2ada9,I30794ea5
* commit 'fb67f05d3d6deb2400fd09390550a7858a3c3158':
  Disable emulator from platform builds.
  envsetup.sh: Use prebuilt emulator binaries if available.
2014-05-11 09:19:43 +00:00
David 'Digit' Turner
fb67f05d3d Merge changes I53b2ada9,I30794ea5
* changes:
  Disable emulator from platform builds.
  envsetup.sh: Use prebuilt emulator binaries if available.
2014-05-11 09:16:16 +00:00
Andrew Hsieh
c581e10a2b am eca0043b: Merge "Disable canonical prefixes of system headers"
* commit 'eca0043b869cb10792e2f3e79d4714bde2945bac':
  Disable canonical prefixes of system headers
2014-05-09 16:59:04 +00:00
Andrew Hsieh
eca0043b86 Merge "Disable canonical prefixes of system headers" 2014-05-09 16:55:00 +00:00
Ying Wang
9889229133 am 3afc688a: Merge "javac: rename common_flags to avoid conflictions"
* commit '3afc688a6acc1753a2b104719a7a27f223f50750':
  javac: rename common_flags to avoid conflictions
2014-05-09 16:45:44 +00:00
Andrew Hsieh
48f239c94f Disable canonical prefixes of system headers
GCC know a few pre-defined paths (relative to its location) to
search for headers, libraries, program, etc.  By default GCC prefixes
its own path(argv[0]) and calls realpath() which result in absolute
path with all symlink, . and .. removed.

It's usually good to have canonicalised paths, but absolute paths
in *.d file can cause unnecessary relinking when stale entries
in ccache cache hit

Add -no-canonical-prefixes (gcc>=4.6) and
-fno-canonical-system-headers (gcc>4.6) to disable realpath() on
prefixed paths

Change-Id: I58d739e61fb013015fb05a9c98b2132b307f915a
2014-05-09 22:12:49 +08:00
David 'Digit' Turner
f6e2694dd2 Disable emulator from platform builds.
Now that emulator prebuilts are available under prebuilts/android-emulator/,
disable building the emulator from source in all platform builds, except
if one defines BUILD_EMULATOR to 'true' in its environment.

NOTE: This patch should be applied after this one to avoid issues
      with the GPU emulation libraries:
            https://android-review.googlesource.com/93980

Change-Id: I53b2ada9ca0c2e159dccee7cdca7f55f6b0d1d42
2014-05-09 15:32:39 +02:00
Yongqin Liu
d1d42e88dc executable_prefer_symlink: add makefile for creating symlink to prefer version
For a 64bit target, we can have support for both 32bit and 64bit version
binary(like app_process, dalvikvm), and there are some commands like am/pm
will call these commands to implement it's function.

In some targets it will prefer to use the 32bit version, and in other targets
it will prefer to use the 64bit version. So this change is to add the common
work for creating the symlink to the prefer version binary,and avoid the
change on the caller commands side like am/pm.

In this change, it uses TARGET_PREFER_32_BIT_APPS to decide linking to
32bit version or 64bit version.

Change-Id: I96f041c0e0ededd953feead30ec63ad63e945a6f
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2014-05-09 14:08:49 +08:00
Andrew Hsieh
d322f2a6ef Define __USE_MINGW_ANSI_STDIO for windows build
Some printf/scanf functions in Windows aren't C99 compatible.
Define __USE_MINGW_ANSI_STDIO for mingw compiler to use it's own set of
replacement libraries which are more C99-like.

Change-Id: I51dfa582971ec0487409067e8bb7fe3a44577b93
2014-05-09 11:45:13 +08:00
Nick Reuter
c43ab6edc2 javac: rename common_flags to avoid conflictions
* Currently the flag conflicts with one seen in hardware/qcom
   rename to avoid issues.

Change-Id: I876fcd6a254f349dc5260509bcddb0367a7d49d8
Signed-off-by: Nick Reuter <nreuter85@gmail.com>
2014-05-08 22:15:35 -05:00
Xavier Ducrohet
05a7a955c1 am afe444a5: Merge "Remove SDK Tools from platform builds."
* commit 'afe444a564ed72cdda792822a0c9dab57a8c9172':
  Remove SDK Tools from platform builds.
2014-05-09 00:52:34 +00:00
Xavier Ducrohet
afe444a564 Merge "Remove SDK Tools from platform builds." 2014-05-09 00:46:45 +00:00
Ying Wang
d6214b3161 am 0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit '0d4b3df6aa495ab2aaabe3a8d5c9c6ad69ab5667':
  Target "tests" now only builds the modules tagged as "tests"
2014-05-09 00:06:36 +00:00
Ying Wang
2d41656cdb am f6603f75: Merge "Add tool to package up built modules."
* commit 'f6603f753d492823e19d0677d5a9ccfc16f51805':
  Add tool to package up built modules.
2014-05-09 00:06:35 +00:00
Ying Wang
07b2055d3e Target "tests" now only builds the modules tagged as "tests"
But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.

Bug: 13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
2014-05-08 17:01:25 -07:00
Ying Wang
989ac38d93 Add tool to package up built modules.
With this change, you can package up modules while avoiding installing
them to the system.img or userdata.img.
- build/core/tasks/tools/package-modules.mk
  You can use this template to package up modules into a zip file and
  preserve the installed file paths.
- LOCAL_PICKUP_FILES, you can use this variable to package up extra
  files/directories.

Bug: 13585955
Change-Id: I103042b24ccf17cf5dc90c016d97ed1dd293e50b
2014-05-08 17:01:06 -07:00
Brian Carlstrom
4ed19f0f42 am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '1e63c2d15cba608a154bbd563f96dde334691147':
  Add dalvik.vm.dex2oat-flags for eng build
2014-05-08 21:53:14 +00:00
Xavier Ducrohet
51e303a281 Remove SDK Tools from platform builds.
(cherry picked from commit edf30221b4890673dc714a1efef3b5faf4ae1522)

Change-Id: Ia74c2ece1528adca10a4eec24e73b4ce361af1a9
2014-05-08 14:50:15 -07:00
Brian Carlstrom
1e63c2d15c Merge "Add dalvik.vm.dex2oat-flags for eng build" 2014-05-08 21:49:31 +00:00
Ying Wang
0a61a6032c am 3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."
* commit '3b15cdb854dfe79507cace8ce54828861bbe7a8c':
  Apply LOCAL_LDLIBS to target build rules too.
2014-05-08 00:21:35 +00:00
Ying Wang
de36cd72e8 Apply LOCAL_LDLIBS to target build rules too.
Use LOCAL_LDLIBS to link against prebuilt libraries (such as NDK
libraries).
Previously LOCAL_LDLIBS only applies to host modules and the behaviour
confuses users.

Change-Id: I515546d7b59ef54e8ef09050eb58ec63534c9291
2014-05-07 11:33:19 -07:00
Brian Carlstrom
fceb115bd6 Add dalvik.vm.dex2oat-flags for eng build
Bug: 12869646
Change-Id: I794320267c846225931f12075c7f32d7848081e9
2014-05-06 20:40:11 -07:00
Ying Wang
ba0bb801c3 am a16583a0: Merge "Fix windows/mingw build."
* commit 'a16583a0880f574937f08bf2c86be72b0f4b9274':
  Fix windows/mingw build.
2014-05-06 19:16:12 +00:00
Ying Wang
1401c76c2f Fix windows/mingw build.
Bug: 14446414
Change-Id: I9d12ed8afb6d4d5a09ef9b2844eb193b52b74271
2014-05-06 12:11:09 -07:00
Ying Wang
c3b2314a58 am a37550ed: Merge "Use prebuilt flex."
* commit 'a37550edd39b3520839251b2a4acceca779a8a8b':
  Use prebuilt flex.
2014-05-06 18:43:28 +00:00
Ying Wang
a37550edd3 Merge "Use prebuilt flex." 2014-05-06 18:41:00 +00:00
Ying Wang
e9dd544dfe am 889a93a4: Merge "add silvermont x86 architecture"
* commit '889a93a49582fa17049f0424af3c1c06f70db407':
  add silvermont x86 architecture
2014-05-06 16:20:51 +00:00
Ying Wang
889a93a495 Merge "add silvermont x86 architecture" 2014-05-06 16:18:56 +00:00
Ying Wang
fb1236a9a8 Use prebuilt flex.
Bug: 14446414
Change-Id: I07fe8d7f246de853e5bae17286834268e36d260c
2014-05-05 18:34:57 -07:00
Colin Cross
735628e8d1 am 2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6
* commit '2ff8919de339209412d9da2a524f566dfcf5847f':
  build: add core_64_bit.mk
  build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
  build: split TARGET_PREFER_32_BIT for apps and executables
2014-05-05 20:14:18 +00:00
Colin Cross
2ff8919de3 Merge changes I7e809264,I504cea21,Ibd2165e6
* changes:
  build: add core_64_bit.mk
  build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
  build: split TARGET_PREFER_32_BIT for apps and executables
2014-05-05 20:11:28 +00:00
Tim Murray
6ac74e6d81 am d720c5a2: Merge "Add -no-integrated-as for ARM64."
* commit 'd720c5a2a6cb44e76c20f96d33b0ac8a96060d91':
  Add -no-integrated-as for ARM64.
2014-05-02 18:24:20 +00:00
Tim Murray
d720c5a2a6 Merge "Add -no-integrated-as for ARM64." 2014-05-02 18:21:34 +00:00
Ying Wang
887a52d022 am a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
* commit 'a6b8025a815cc5c9b441a91917f100486c270446':
  Add WITH_DEXPREOPT to the list of protected global variables.
2014-05-02 04:00:30 +00:00
Ying Wang
a6b8025a81 Merge "Add WITH_DEXPREOPT to the list of protected global variables." 2014-05-02 03:57:33 +00:00
Ying Wang
9c44021535 Add WITH_DEXPREOPT to the list of protected global variables.
Bug: 14380196
Change-Id: I02cff39eeaf2deddf434c0c310063e4b341edd43
2014-05-01 20:55:30 -07:00
Colin Cross
2a4f0ff32f build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
If the product prefers 32-bit apps signal that preference to
PackageManager by reversing the abi list.

Also uses the absence of TARGET_SUPPORTS_32_BIT_APPS and
TARGET_SUPPORTS_64_BIT_APPS to remove those ABIs from the
ABI list.

Change-Id: I504cea21b6f800a7a9e7706b4a7123d3fb07c383
2014-05-01 10:55:43 -07:00
Torne (Richard Coles)
f0b5bfec7b am a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
* commit 'a0267df234db59d34891a01e0761233abc9ae4b1':
  Remove libpac and v8 from the 64-bit blacklist.
2014-05-01 09:20:19 +00:00
Torne (Richard Coles)
a0267df234 Merge "Remove libpac and v8 from the 64-bit blacklist." 2014-05-01 09:17:26 +00:00
Colin Cross
a3339e98e6 build: split TARGET_PREFER_32_BIT for apps and executables
Introduce two new flags, TARGET_PREFER_32_BIT_APPS and
TARGET_PREFER_32_BIT_EXECUTABLES that individually control
compilation of apps and executables.  If TARGET_PREFER_32_BIT is
set, the build system will automatically set both new flags.

Change-Id: Ibd2165e688675c2884d9e7ddf82d7dd6c28521f3
2014-04-30 18:18:59 -07:00
Tim Murray
6f144b8f65 Add -no-integrated-as for ARM64.
Change-Id: I7faba190554aa43f43b2eb164bdc7b3bfab68ef0
2014-04-30 15:55:52 -07:00
Tim Murray
27fe940676 am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit '7e65b6c1e53a51db0aa65126f2453f27daa0f22f':
  Remove tblgen and clang-tblgen from prebuilts.
2014-04-30 21:52:33 +00:00
Tim Murray
75b58cc827 Remove tblgen and clang-tblgen from prebuilts.
Change-Id: I89fb74da5a516d0f768f72518a401216f8a5b1a8
2014-04-30 13:54:32 -07:00
Bill Yi
1e4adfa837 Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD 2014-04-29 11:32:53 -07:00
Andrew Boie
155fc8b5fe add silvermont x86 architecture
This is used for Baytrail targets.

Change-Id: I5a2fa6dbb8217a326ee09f5ea434885718ab3f0c
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
2014-04-30 01:23:25 +08:00
Torne (Richard Coles)
91d4944434 Remove libpac and v8 from the 64-bit blacklist.
external/chromium-libpac has been updated to depend on the copy of V8 in
external/chromium_org, and its makefiles updated to be multilib-safe.
external/v8 is thus unused and has been removed from the tree.

Bug: 12452053
Change-Id: I757fa187f7f67cd9a89d4b228d4ce3ed6d2858b1
2014-04-29 10:23:56 +01:00
Andrew Hsieh
140761af09 Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
prebuilts/ndk/current/platforms/android-19/arch-x86_64/usr/lib
is renamed to usr/lib64 to be more consistent with rest of
lib paths in x86_64 toolchain, which is multilib

See https://android-review.googlesource.com/#/c/92441/

Change-Id: I4e59245505d0fa87ae3608e81e715ccfcecc5ec8
2014-04-25 23:47:10 -07:00
Ying Wang
676e11fed8 Merge "include LGPL projects in GPL archives" 2014-04-25 21:56:27 +00:00
Tim Murray
43d5e1bbc4 Build changes necessary for LLVM 3.5 switch.
Change-Id: Icb6065daada7cb1d7425206830a4ef9e23454c03

Conflicts:
	core/clang/arm.mk
2014-04-24 13:14:32 -07:00
Elliott Hughes
847fd0311f Merge "Leave 'linux' defined on x86/x86-64, like arm." 2014-04-24 16:19:17 +00:00
Elliott Hughes
1076c5685b Merge "Leave 'linux' defined on mips/mips64, like arm." 2014-04-24 16:16:06 +00:00
Torne (Richard Coles)
0933cf22fc Remove chromium_org and webview from the 64-bit blacklist.
external/chromium_org has been updated to handle 64-bit architectures
correctly in its makefiles; remove it from the blacklist so we can start
experimenting with building a 64/32 multilib version.

Change-Id: Ieb0e4f3cfea1578e01954c4656df90cd8d36b8cc
2014-04-24 13:30:47 +01:00
Elliott Hughes
1acd8b0552 Leave 'linux' defined on mips/mips64, like arm.
Change-Id: Idf1e781c34d45d1e20b7e5542d79201ae93668fe
2014-04-23 23:24:36 -07:00
Elliott Hughes
2c8e95528c Leave 'linux' defined on x86/x86-64, like arm.
Change-Id: I53013a45c19a643a985de3f339b8b3f8f4dc39d2
2014-04-23 23:09:30 -07:00
Andrew Hsieh
dfde360b2c Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
Change-Id: I763398d523bf4851a13722f72b12ec69d7a4bb4f
2014-04-23 14:47:00 -07:00
Tim Murray
d318ba66f9 Update build system for better Clang behavior on Mac.
Change-Id: I1813954681b670807d7e3faaf6d5f5a769cc5f2e
2014-04-22 09:26:22 -07:00
Ying Wang
695e826a0c Update rules to install JNI libraries.
Previously we have to use LOCAL_REQUIRED_MODULES to install jni
libraries for an apk in bundled build.
With this change, we'll use LOCAL_JNI_SHARED_LIBRARIES alone to
install jni shared libraries.

The new rules are:
- If we are doing unbundled build, or the apk isn't going to be
  installed to system partitions, we'll embed the jni libs in the
  built apk.
- Otherwise, the jni libraries will be installed to the system
  lib path, and symlinks created in the app specific lib path.

Change-Id: Id6bd5301eb632bda3593664acee580f0d8b1d5d4
2014-04-18 16:36:19 -07:00
Ian Rogers
67c209281f Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled." 2014-04-18 23:10:31 +00:00
Ian Rogers
5d186aee8e For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
Change-Id: Ia95d74517f8182031d6044ae55559010a98ec5ca
2014-04-18 15:23:40 -07:00
Ben Cheng
e76fee59fc Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
This reverts commit 084a7f8387.

GCC 4.9 still has stability issues (b/14160872)

Change-Id: I4d40829dbbfac0e7b6cd7eaf9924744bc5714271
2014-04-18 18:34:35 +00:00
Ben Cheng
084a7f8387 Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7

NDK libraries are still picked up from prebuilts/ndk/*/4.8/*
GCC has been patched to disable codegen for calling
__cxa_throw_bad_array_new_length.

Change-Id: Ie0bf38357c0cf3d265d8b5dd3c2b8a8fd83b1de1
2014-04-16 12:18:14 -07:00
Ben Cheng
d32bbe7d06 Merge "Explicitly link libstdc++.a for static gtest executables." 2014-04-16 17:03:21 +00:00
Ben Cheng
e34bb09eab Explicitly link libstdc++.a for static gtest executables.
Change-Id: I29e3a4036264acd00dfa3229c9d0fc52ee20830e
2014-04-16 09:42:56 -07:00
Andrew Hsieh
50536c20af Add -Wl,-maarch64linux
The "-maarch64linux" switch is needed before aarch64-*4.8 is rebuilt with
backport of upstream patch, see https://android-review.googlesource.com/#/c/91099/

The existing ld.bfd is fine because it's configured to support
aarch64linux only.  ld.mcld (see https://android-review.googlesource.com/#/c/91047)
needs explicit emulation switch because it supports multiple targets

Change-Id: Idc1a491c5722ea9e26db917b667b1000bccc1f60
2014-04-15 11:54:06 -07:00
Narayan Kamath
22261a3f9b Merge ""desktop" linux has Posix clocks." 2014-04-15 10:58:52 +00:00
Colin Cross
5b1fa1c8a0 Merge "build: remove LOCAL_NO_2ND_ARCH" 2014-04-12 00:06:30 +00:00
Colin Cross
149d65b177 build: remove LOCAL_NO_2ND_ARCH
Delete LOCAL_NO_2ND_ARCH, it is no longer used.  Equivalent
functionality is available with LOCAL_MULTILIB := first.

Change-Id: I36838a8a7e10b0a59ca0022c4c8a3a190e782c71
2014-04-11 16:57:36 -07:00
Ben Cheng
38fef38c40 Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
This reverts commit 1ae9b213eb.
Sigh... new warnings found by 4.9 break checkbuild.

Change-Id: I46ad622fa9c8ac4fb1e15e29bb400634abc5914c
2014-04-11 23:36:25 +00:00
Andrew Boie
08a943b16a include LGPL projects in GPL archives
LGPL projects need their source code distributed under very
similar conditions to GPL and MPL, the only difference is the
conditions under which they may be linked. It makes sense to
include them in the GPL archive tarballs.

Change-Id: I2c2df03906bfeee55566102aa688e4cdc283700b
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2014-04-11 21:38:00 +00:00
Ben Cheng
1ae9b213eb Use aarch64-linux-android-4.9 for arm64 build (attempt #2)
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7

NDK libraries are still picked up from prebuilts/ndk/*/4.8/*
GCC has been patched to disable codegen for calling
 __cxa_throw_bad_array_new_length.

Change-Id: Ie647fc4c6b227d6bee792f04d5c2f02eb0099559
2014-04-11 12:22:56 -07:00
Ben Cheng
eec11d9727 Merge "Decouple platform compiler and NDK library versioning." 2014-04-11 17:02:32 +00:00
Ben Cheng
4de6fa4069 Decouple platform compiler and NDK library versioning.
TARGET_GCC_VERSION: select compiler from prebuilts/gcc/...
TARGET_NDK_GCC_VERSION: select libraries from prebuilts/ndk/...

Change-Id: I4422a42cdc97aa92b40798014cba82c3c123bbd2
2014-04-10 22:46:26 -07:00
Colin Cross
161cd77f21 build: remove packages/ from 64-bit blacklist
Everything under packages/ will build for 64-bit now, and
package.mk has been updated to not produce 64-bit libraries
on devices that don't support them (all of them right now).

Change-Id: I2c10e41f727cfc8fe237819308a6dfa34c4fff3f
2014-04-10 20:44:24 -07:00
Colin Cross
1750944332 build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS
Use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS to
determine which native libraries to build for an app.  If
both are set, it will use 64-bit unless TARGET_PREFER_32_BIT is set.
If only one is set, it will only build apps that work on that
architecture.  If neither is set it will fall back to only building
32-bit apps.

On existing 32-bit devices neither variable will be set, and the
build system will continue to build 32-bit apps.

Once a device has support for a 64-bit runtime, the same logic
that selects the dual runtimes should set TARGET_SUPPORTS_32_BIT_APPS
and TARGET_SUPPORTS_64_BIT_APPS, and packages will be built for
the preferred arch, or fall back to the non-preferrred arch if
necessary.

For testing, a device may set TARGET_SUPPORTS_64_BIT_APPS without
TARGET_SUPPORTS_32_BIT_APPS to produce only 64-bit apps.

Change-Id: I5b5e23f15602c3cf9bd96791971208a85492c7a3
2014-04-10 20:44:24 -07:00
Colin Cross
dc1c95aa20 build: add support for LOCAL_MULTILIB := 64
I don't expect it to be useful for modules, but package.mk will
use it to only install 64-bit native apps on devices that
only have a 64-bit zygote.

Change-Id: If3f5a81c3a60bd13fa6ded08e2a7579a29877324
2014-04-10 15:49:38 -07:00
Colin Cross
d3624d5f48 build: fix TARGET_PREFER_32_BIT
TARGET_PREFER_32_BIT can't assume that the 32-bit rule is allowed,
it needs to try the 32-bit rule first, then fall back to the 64-bit
rule in case the module specifies LOCAL_MODULE_TARGET_ARCH or
LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH to disallow the 32-bit build.

Also port TARGET_PREFER_32_BIT to package.mk.

Change-Id: I07520b75c4ee11a1e95a82b3afa2a33d4907eb04
2014-04-10 15:49:32 -07:00
Ben Cheng
13eaf184f6 Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build."" 2014-04-10 17:14:57 +00:00
Ben Cheng
81892e29ff Revert "Use aarch64-linux-android-4.9 for arm64 build."
This reverts commit 6154690d86.

Change-Id: I7427ad6ca1f74ad632229348bac31ebdbc0590ad
2014-04-10 17:14:01 +00:00
Narayan Kamath
163140ceaf "desktop" linux has Posix clocks.
Change-Id: I90885a2bbb65f14f774ae72b2ca6738176bf0341
2014-04-10 17:36:53 +01:00
Ben Cheng
d957d6bbdb Merge "Use aarch64-linux-android-4.9 for arm64 build." 2014-04-10 16:33:51 +00:00
Ben Cheng
6154690d86 Use aarch64-linux-android-4.9 for arm64 build.
Change-Id: I63e1b54947326fb5da07af7691d4729bcbf99ac1
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7
2014-04-09 15:58:08 -07:00
Ying Wang
d81d71a020 Increase the maximum javac heap size again.
Change-Id: Ic3422650ea22977f3dcfd74505cb287ff6543c2d
2014-04-09 14:27:29 -07:00
Narayan Kamath
e6243e176b Stop defining HAVE_TIMEDWAIT_MONOTONIC.
We no longer provide this function in bionic. All callers
should be moved over to pthread_condattr_setclock().

Change-Id: Iccd3384b40de423f7d5f9521b6d8073bf8bdea42
2014-04-09 16:08:09 +00:00
Narayan Kamath
cf61a7a0db Merge "Add 32 / 64 bit abi lists to system properties." 2014-04-09 08:48:04 +00:00
Narayan Kamath
7303ebda84 Add 32 / 64 bit abi lists to system properties.
Introduce ro.product.cpu.abilist32 / abilist64, which are
comma separated lists of the 32 and 64 bit ABIs that the
device supports. These properties are used by the zygote and
system server to determine what ABI an app should be
started with.

This changes move abilist related make steps out of envsetup.mk
and into config.mk because they depend on variables set by
core/combo/***. Additionally, config.mk performs a few additional
cleanups of these variables (like stripping them) after the
inclusion of envsetup.mk so this seems like a better place to
put them.

bug: 13647418

Change-Id: I3db39bdd761220c5b4966f651892fb592396f9a1
2014-04-08 17:40:40 +01:00
Ying Wang
bdac8cf148 Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"" 2014-04-07 22:41:22 +00:00
Ying Wang
5b6b46459c Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"
It seems to be a javac/javadoc bug.
See https://code.google.com/p/doclava/issues/detail?id=38

sun.util.resources.OpenListResourceBundle is a class defined in the host rt.jar,
but sometimes on some platform javadoc/javac can't find it.
-XDignore.symbol.file tells javadoc/javac to skip the stubs file ct.sym
and link against rt.jar directly.

Change-Id: I3930f7399fc14b2d6b43c29f737fa90f37515aff
2014-04-07 15:19:33 -07:00
Ying Wang
584d8adbea Different bootclasspath for droiddoc.
- If it's host module, don't set bootclasspath;
- If it's arget module,
  - It can build against the API stubs;
  - It can build against a historical SDK version;
  - It can build against core.jar

Change-Id: Id1ec3ba624bc38068b206ad7173f4facf590e021
2014-04-07 15:14:50 -07:00
Narayan Kamath
f122d41b75 Fix droiddoc generation.
We want javadoc generated from the standard libraries
we supply and not the host standard libraries.

This also has the side effect of fixing javadoc generation
for java7 APIs that android introduced, while compiling
with java6.

bug: 8992787
Change-Id: Idebc7e12c7743a43b425ef4971f4482719fd480d
2014-04-07 15:08:18 -07:00
Narayan Kamath
c84889b80a Build with java7 by default.
All introduce a flag LEGACY_USE_JAVA6 to force java6 builds.
This is an unsupported configuration, and provided temporarily
to iron out regressions and compare build output (if required.).

- Increment the version check sequence number.
- Move a more specific check (OpenJDK vs non OpenJDK) after
  the more general version check.
- Update the link in the version check error message to the
  "initializing" page instead of the "download" page. The latter
  talks about repo, mainly.

bug: 8992787

Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d

Conflicts:
	core/main.mk
2014-04-04 18:44:47 -07:00
Ying Wang
faf3d5ed0f Disable host -fPIE if BUILD_HOST_static is set.
It turns out -static doesn't work with -fPIE.

Bug: 13568878
Change-Id: I66951a5517dece1c5f4f22c329cf703bd99b5163
2014-04-04 14:38:14 -07:00
Ying Wang
8a52b231d2 Unset _JAVA_OPTIONS before running "java -version".
Unfortunately the previous approach of grepping out java version before
"head -n 1" clash with the effort of running "java -version" only once.

Change-Id: Ic78719c3bf1a54a45342d74bbbfa8e83bbc1bce1
2014-04-02 18:15:10 -07:00
Torne (Richard Coles)
c783b9bda9 Merge "Add GYP as a target type that requires 2nd arch." 2014-04-02 17:20:11 +00:00
Narayan Kamath
bee0ec4196 Add warning message for java6 builds.
The instruction URL has been amended and a few additional
details have been added.

(cherry picked from 8c06afdea3)

Change-Id: Icaffc3b13ed881ac7e29f2021ed31eb1f877a5ab
2014-04-02 13:16:15 +01:00
Ying Wang
8d45e51803 Call "java[c] -version" only once
and print out the full output if error occurs.
Bug: 11672548

(cherry picked from 7b66d366bf)

Change-Id: I8e2f2ffa2f28146405273b04667efe3c8d1c03ad
2014-04-02 10:45:17 +00:00
Narayan Kamath
2f5de9f504 Merge "Bring main.mk in sync with master." 2014-04-02 10:45:07 +00:00
Torne (Richard Coles)
3972253b0f Add GYP as a target type that requires 2nd arch.
"GYP" class targets are used by external/chromium_org for gyp's "none"
type. The processing in these targets needs a separate intermediate
directory for the primary/secondary architecture, so add it to the list
in intermediates-dir-for along with libraries/executables.

Change-Id: Id05899c83b45ed0647dfbfa6b0b2e7f61b04348b
2014-04-02 11:33:17 +01:00
Nicolas Geoffray
38c0ac7386 Merge "Use debug versions of dex2oat explicitly." 2014-04-02 08:45:56 +00:00
Dmitriy Ivanov
00479a9fe0 Remove redundant my_target_global_ldflags
* Fix: my_target_global_ldflags is defined in binary.mk
    so they effectivelly override previous definition

Change-Id: I9c7d9bde82c3a6d25a94ae109fa71ecaa33640b0
2014-04-01 16:36:21 -07:00
Tim Murray
125a3c9fb0 Always use prebuilt clang, even if we're explicitly building clang/LLVM.
This is needed for self-hosting Clang/LLVM.

bug 13588226

Change-Id: Ic98adc2b174b12ce046b7b65bbc28901a766a485
2014-04-01 16:08:51 -07:00
Brian Carlstrom
49c80cd9b6 cortex-a7 supports div
(cherry picked from commit cece45d226)

Change-Id: I9975171ef2c2cd3a9481fa0896473fec684095f3
2014-04-01 10:25:59 -07:00
Narayan Kamath
d5fb782682 Bring main.mk in sync with master.
These lines were removed in aosp in commit e2d27887b
but a bad merge conflict resolution left them in master.

Subsequent changes on master started using these variables
so they're being brought back.

Change-Id: Ic8f3c295130c47eb0d66057880f9d4f70c89af94
2014-04-01 13:13:13 +01:00
Nicolas Geoffray
ed154c3ba6 Use debug versions of dex2oat explicitly.
Change-Id: Ie7c238908a5739af752a08fec1a04914026a8f96
2014-04-01 08:43:26 +01:00
Daniel Leung
625974cf2a Add intel to the vendor whitelist
Change-Id: I91d6ff72629523050b4f26c2d731cac90ef49348
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
Reviewed-by: Kumar-mayernik, Nisha <nisha.kumar-mayernik@intel.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Tested-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
2014-04-01 10:38:12 +08:00
Ying Wang
b34af41e57 Merge "Fix java version detection when _JAVA_OPTIONS is set." 2014-03-31 23:53:52 +00:00
Peter Ammon
bb406bf4c0 Fix java version detection when _JAVA_OPTIONS is set.
_JAVA_OPTIONS is an environment variable that
can be used to affect the behavior of java and javac.
It is currently required to get Android to build on
some configurations, where the default Java heap size
is too small. Unfortunately, if _JAVA_OPTIONS is set,
both java and javac will output its value to the console
as the first line on every invocation, including trivial
ones like java -version. This will confuse main.mk’s
version detection, which only looks at the first line of
output. Tweak the version detection to run grep before
head, so that the _JAVA_OPTIONS line is filtered by the grep.

Change-Id: I69aee52b56d27711b7d3087ec6b3ebab07ffc3af
2014-03-31 15:36:02 -07:00
Christopher Ferris
0c4870a4cd Merge "Specify -mcpu=cortex-a15 for denver CPU variants." 2014-03-31 19:06:28 +00:00
Ying Wang
1c380c13d9 Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND" 2014-03-31 17:30:06 +00:00
Narayan Kamath
431b4bb354 Merge "Extend the CPU ABI specification mechanism." 2014-03-31 12:09:51 +00:00
Ying Wang
ce1c596e15 Remove the unnecessary indirection of TARGET_STRIP_COMMAND
Now all archs use the same strip command which can be put just in
transform-to-stripped.

Change-Id: Ief79697d47ea142fc9e63e63a7e2dace9e839165
2014-03-28 17:25:34 -07:00
Mathieu Chartier
1da02a1ae1 Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000" 2014-03-28 19:19:13 +00:00
Narayan Kamath
1a43b375b4 Extend the CPU ABI specification mechanism.
Add a (read only) system property that is a comma
separated list of ABIs supported by the device in order
of preference. For example, typical arm-v8 device might
define:

ro.cpu.abilist = arm64-v8a,armeabi-v7a,armeabi

For most purposes, a single flattened list like the above is
probably more useful than the parallel system of variables
TARGET_CPU_ABI{2} / TARGET_2ND_ARCH_CPU_ABI{2} that we use
in the build system.

Change-Id: If9102669ad9f5f8fd89a8bcc5bf88cca1acadc3c
2014-03-28 17:10:47 +00:00
Ying Wang
01f11b2aa9 Increase the maximum javac heap size.
Java 7 needs more memory when you run some annotation tools.

Change-Id: Ia8b423244b9ce164500b24867fe2b3d10a5089ff
2014-03-26 19:23:46 -07:00
Colin Cross
8c141e7e9f build native tests for 32-bit and 64-bit
32-bit tests will build into /data/nativetest
64-bit tests will build into /data/nativetest64

Change-Id: I31492c7d1273ba18bb2577fae150008a214c3bf4
2014-03-26 13:13:23 -07:00
Colin Cross
e6e48f67d8 add support for LOCAL_MULTILIB
LOCAL_MULTILIB replaces LOCAL_32_BIT_ONLY and
LOCAL_NO_2ND_ARCH, although both are still supported.

Set LOCAL_MULTILIB := 32 to always build a module 32-bit.
This is the same as specifying LOCAL_32_BIT_ONLY.

Set LOCAL_MULTILIB := first to always build a module for
the first architecture (64-bit on a 64-bit target, 32-bit on a
32-bit target).  This is the same as specifying LOCAL_NO_2ND_ARCH.

Set LOCAL_MULTILIB := both to build for both architectures
on a mulitlib (64-bit) target.

If LOCAL_MULTILIB is not set libraries will default to "both",
and executables, packages, and prebuilts will default to building
for the first architecture if supported by the module, otherwise
the second.

Executables that set LOCAL_MULTILIB := both must set either
LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 or
LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to specify how to
differentiate the install locations of the two versions.

Change-Id: I22ab6aa342b231c307b1d8a86cea4fd91eea39f5
2014-03-26 13:12:59 -07:00
Colin Cross
5a9db90e40 add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
Some executables will need to be built for both 32-bit and 64-bit.
For linker/linker64, debuggerd/debuggerd64, and a few more, they
will be installed in the same path (/system/bin), but with different
filenames.  Allow the module to specify LOCAL_MODULE_STEM_32 and
LOCAL_MODULE_STEM_64 to name the two versions.

Change-Id: I573e8678c7332245a064f31246be0a05f0a9e25f
2014-03-25 13:49:58 -07:00
Colin Cross
87974056d9 add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
Some executables will need to be built for both 32-bit and 64-bit.
For tests, it will be convienient to keep the name of the executable
the same, but install them in a different location.  Add
LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to allow a module
to specify different paths for 32-bit and 64-bit executables.

Change-Id: I3be830e899c6d485fe55c25c66b20b3fe64c795e
2014-03-25 13:48:40 -07:00
Tim Murray
e64ce73e54 am b35094ec: am 01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit 'b35094ec709c8de7f3f7d6dbd54655ec99cd9529':
  Make Clang host builds hermetic on Linux.
2014-03-25 18:40:07 +00:00
Tim Murray
01aa01dbfa Merge "Make Clang host builds hermetic on Linux." 2014-03-25 18:33:29 +00:00
Colin Cross
35bd1357c9 am 0143ee4a: am a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '0143ee4a5779620659c7b59e4294359c4a96af78':
  remove libeffects from 64-bit blacklist
2014-03-25 18:07:12 +00:00
Colin Cross
a3c76c2824 Merge "remove libeffects from 64-bit blacklist" 2014-03-25 17:54:56 +00:00
Andrew Hsieh
72e8d2a3a4 am c550cd45: am fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
* commit 'c550cd45536c7153726c502886bf32797e997dd3':
  Pick gnu-libstdc++ based on TARGET_GCC_VERSION
2014-03-25 02:54:04 +00:00
Tim Murray
02cefc93a8 Make Clang host builds hermetic on Linux.
This lays the groundwork for making builds hermetic on Darwin as well.
That will be fixed in a future patch.

bug 13435344

Change-Id: Iae82d0b9efad0598d682ff5fd4daa737aa607866
2014-03-24 19:38:47 -07:00
Andrew Hsieh
92d50c1a10 Pick gnu-libstdc++ based on TARGET_GCC_VERSION
Previously we have only one set of include/lib paths for
LOCAL_NDK_STL_VARIANT:=gnustl_static regardless of GCC
version, which is wrong because each GCC version
come with its own libstdc++.

Change-Id: I2a01c2120b6948aedce00e2f8d08dfc6932126dd
2014-03-25 09:46:27 +08:00
Colin Cross
966c9194a6 remove libeffects from 64-bit blacklist
Everything under frameworks/av/media/libeffects compiles fine for
64-bit

Change-Id: I03519a98903b7d65936053ef7eda8926cce60ea0
2014-03-24 18:40:11 -07:00
Ying Wang
288bf3a377 am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '266cf4f2595323170fe02db05835884b4522a0f9':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
2014-03-24 21:26:51 +00:00
Ying Wang
266cf4f259 am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit 'f39752e99b4e5083f1e91c46722f87def8143b49':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
2014-03-24 21:21:26 +00:00
Shu Zhang
453afb242c Specify -mcpu=cortex-a15 for denver CPU variants.
Change-Id: Ic27484c92a48b45148021a61420ffdd55a9dd945
2014-03-24 16:19:50 +08:00
Ying Wang
1f5c4f67d4 am 5a4c783c: am 8c60a1df: Merge "Complete installed shared library dependency"
* commit '5a4c783c2d960a4ab76b4cdd57933e31dbfe6211':
  Complete installed shared library dependency
2014-03-21 23:58:10 +00:00
Ying Wang
d8d3721240 Complete installed shared library dependency
Previously the installed shared library dependency doesn't include
modules introduced by LOCAL_SHARED_LIBRARIES_<arch>.
This change fix the problem.
It also cleans up use of the shared library variable.

Bug: 13528787
Change-Id: Id8d807cc57f0ec4a71f18b64545d91191efad8fb
2014-03-21 16:17:04 -07:00
Ying Wang
f39752e99b Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Bug: 11335547
Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0
2014-03-20 17:28:57 -07:00
Colin Cross
3c23ee5e19 am 189a874f: am 8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
* commit '189a874f0f3d297107d02222dc3291943a9e82b0':
  remove more projects from 64-bit blacklist
2014-03-20 20:22:59 +00:00
Ying Wang
3c598d19b2 am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37':
  Remove the redundant DISABLE_DEXPREOPT
2014-03-20 20:18:32 +00:00
Colin Cross
8c1bbdb96e Merge "remove more projects from 64-bit blacklist" 2014-03-20 20:16:53 +00:00
Ying Wang
c6848b398d Remove the redundant DISABLE_DEXPREOPT
To disable dexpreopt, use just:
WITH_DEXPREOPT=false

Change-Id: I5804f3774f8ec50eb16c5336776dbce0c28b16d9
2014-03-20 13:01:31 -07:00
Ying Wang
7796921cc5 am 9ce34617: am 4f9d6f57: Merge "Fix embedded build"
* commit '9ce34617a001338093b0de85443925a37a967f0d':
  Fix embedded build
2014-03-20 19:38:45 +00:00
Ying Wang
8c7e74ee05 Fix embedded build
1) Disable dexpreopt if DALVIK_VM_LIB isn't set up by the product.
2) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is moved to config.mk,
for it's only decided by target arch.
3) Move Java module input from embedded.mk to base.mk.

Change-Id: Ife70b0cd8cee2e5c92f356c808affa56f494b49a
2014-03-20 12:13:10 -07:00
Colin Cross
e6d118574b remove more projects from 64-bit blacklist
These all build now.

Change-Id: If7c5f58512a2931617900ddc730797750ab8301c
2014-03-20 00:08:20 -07:00
Mathieu Chartier
3408ca0e0d Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000
Required for getting ART with valgrind on device working since
valgrind maps things in the 0x60000000 address range.

Bug: 13323732

Change-Id: I05efdbf3fe5acd1418e1d4ced5844154fb4c5d37
2014-03-19 16:52:43 -07:00
Glenn Kasten
63e579b4e0 am b614ef1e: am cb902fff: Merge "A few other removals for the 64 bit blacklist."
* commit 'b614ef1eef10815652451c332954a6a6ee6f02ba':
  A few other removals for the 64 bit blacklist.
2014-03-19 21:41:39 +00:00
Glenn Kasten
cb902fff82 Merge "A few other removals for the 64 bit blacklist." 2014-03-19 21:32:22 +00:00
Christopher Ferris
810cf65d71 am aea9f041: am 8b1bcc7d: Merge "Add a method to leave the symbol table in a library."
* commit 'aea9f041f72a128065691ac402ccdb72a5a7aad4':
  Add a method to leave the symbol table in a library.
2014-03-19 18:15:39 +00:00
Narayan Kamath
c7d24d029b A few other removals for the 64 bit blacklist.
- external/chromium now compiles
- stagefright codecs now compile.
- frameworks/base now compiles.

Change-Id: I1226b79cd3e0b5e2fd786bb506e022b47fe5e264
2014-03-19 13:15:31 +00:00
Christopher Ferris
a6e2f9322c Add a method to leave the symbol table in a library.
When LOCAL_STRIP_MODULE := keep_symbols is set, then the normal strip rules
will be modified so that only the .debug_* sections are removed. The original
symbol table is left alone.

This allows the compilation of certain libraries so that libbacktrace library
can provide meaningful names to functions.

Bug: 12958251
Change-Id: I82bdc304a463012e29086325ccb51163464cb4a9
2014-03-18 17:34:41 -07:00
Ying Wang
51d4cd2491 am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning"
* commit '87a25ea72f41b77898e62ad09e48e0b0de1dc84f':
  Remove arm64 clang build warning
2014-03-18 23:07:47 +00:00
Ying Wang
ed56902c29 Remove arm64 clang build warning
Now we have enabled arm64 clang.
This change remvoed arm64 clang build warning and cleaned the
arm64 unknow c flags.

Change-Id: Ia583a78c6d364e603ff09df423aa34a6e03d0b9b
2014-03-18 15:58:13 -07:00
Brian Carlstrom
6c6d9b1f58 Merge "Try to catch more misuse of $(my-dir)." into klp-dev-plus-aosp 2014-03-18 22:20:33 +00:00
Ying Wang
ae5a1e1447 Try to catch more misuse of $(my-dir).
(cherry picked from commit 79e8319b2e)

Change-Id: I779af79c83de2ad1944269dd5bd31d65ff844064
2014-03-18 15:11:44 -07:00
Glenn Kasten
d50da36c8b am 023c2865: am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"
* commit '023c286563ce09b2d42c81a38d4dc17ee011ac9e':
  Don't blacklist all of frameworks/av for 64-bit
2014-03-18 21:54:01 +00:00
Glenn Kasten
97542cc9bf Merge "Don't blacklist all of frameworks/av for 64-bit" 2014-03-18 21:45:12 +00:00
Glenn Kasten
488fe8481a Don't blacklist all of frameworks/av for 64-bit
Change-Id: Ic2db99b1b577e3355c50982af5068bce32edf4ba
2014-03-18 12:12:54 -07:00
Ying Wang
8824386987 am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."
* commit '5462f7f953915bd345a58b17977e79e6405b56d0':
  Remove unused LOCAL_ASSET_FILES.
2014-03-18 18:44:05 +00:00
Ying Wang
594f2a4261 Remove unused LOCAL_ASSET_FILES.
Change-Id: Ie0b2b2e30a158b779016767fb868f3e03b2f828a
2014-03-18 11:31:09 -07:00
Andrew Hsieh
23371f350a am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
* commit 'd14f3cc7bc9983ea5ba1c2d952d2b5f51935f42c':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
2014-03-18 00:09:32 +00:00
Andrew Hsieh
73d800e519 Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
Add llvm libc++ static and shared libraries

Change-Id: I92af9b6ab21cbf8ea82e014a4c11aeb5455920f9
2014-03-17 20:30:45 +08:00
Ying Wang
8196f6159e am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
* commit 'a660d06eeb9a53bc8d88fc2e559d461dc6a77d67':
  Don't modify LOCAL_STRIP_MODULE
2014-03-16 20:08:32 +00:00
Ying Wang
1cda15d323 Merge "Don't modify LOCAL_STRIP_MODULE" 2014-03-16 20:02:56 +00:00
Ying Wang
e1889af2d5 Don't modify LOCAL_STRIP_MODULE
LOCAL_STRIP_MODULE will be reused in multilib build.

Change-Id: I3512efb360c7eaafad02859723ab4368778effed
2014-03-16 12:43:49 -07:00
Colin Cross
f6da0820b3 am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang."
* commit '6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
  Work in progress to enable build system support for Clang.
2014-03-16 00:00:20 +00:00
Colin Cross
db24577bbd Merge "Work in progress to enable build system support for Clang." 2014-03-15 23:54:03 +00:00
Tim Murray
b5f333bbef Work in progress to enable build system support for Clang.
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
2014-03-14 00:39:03 -07:00
Dianne Hackborn
6668799e7b resolved conflicts for merge of 264d4001 to klp-dev-plus-aosp
Change-Id: Ib95e5f6a6a5a613395a13a9df3d283348576d241
2014-03-13 17:35:26 -07:00
Andrew Hsieh
2fceaccc30 am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
* commit 'de8edc8a35e5a53c6f1f8e5db099c28691319585':
  Fix HOST_TOOLCHAIN_PREFIX
2014-03-14 00:26:58 +00:00
Andrew Hsieh
933e8940d0 Merge "Fix HOST_TOOLCHAIN_PREFIX" 2014-03-14 00:19:19 +00:00
Narayan Kamath
dc8541686c Revert "Remove external/chromium from the 64 bit blacklist."
This reverts commit 27bf51144a.

Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c
2014-03-13 11:26:26 -07:00
Narayan Kamath
c88d174010 Remove external/chromium from the 64 bit blacklist.
This isn't the same as chromium_org (which is used by the
webview). This is a 3 year old snapshot of the net stack which
compiles under 64 bit. It's currently used on aosp master by
libstagefright_chromium_http.

This project can be removed if the changes that remove the
chromium dependency are cherry-picked to aosp/master.

Change-Id: I5d0f9ed03ea9842b47d980d77ea32bc7a3f6998f
2014-03-13 11:26:26 -07:00
Ben Cheng
b0f8c44069 OProfile is no longer compiled now.
BUG: 13249790
Change-Id: I2d4fd8f888823687ea41ddbee1f7ce2a7ebc99f7
2014-03-13 11:26:26 -07:00
Narayan Kamath
bde97f477b Amend 64 bit blacklist.
- external/skia now builds on arm64, frameworks/base/libs/hwui
  depends on it.
- external/bluetooth/bluedroid builds on 64 bit, though there
  isn't any obvious way to test it without real hardware.
- frameworks/ml now builds, as does external/srec
- frameworks/opt, frameworks/ex and frameworks/wilhelm don't
  build because of their dependency on frameworks/av.

frameworks/av should probably be dropped out of the blacklist
and replaced by individual markers on targets that we want
for 64 bit (we don't want all of them for arm64).

Change-Id: I9735108840fcba21ac8918bedf0d6de8989de086
2014-03-13 11:26:26 -07:00
JP Abgrall
7e09b998c3 DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
This enables tcpdump for 64bit builds.

This reverts commit 24f99bd4b3.

Change-Id: Ic1413b2f3f66cedbe756d73656c90b3177ba66c0
2014-03-13 11:26:26 -07:00
JP Abgrall
470125849d DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
This is until aosp gets the latest libpcap+tcpdump currently only on internal.

This reverts commit 5c68e265ac.

Change-Id: If6a990c72cb3a8d699cf0881f7d5fb8b725fdf2e
2014-03-13 11:26:26 -07:00
Ying Wang
f3ba9484b5 Remove external/tcpdump from 64-bit build blacklist.
Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097
2014-03-13 11:26:26 -07:00
Elliott Hughes
1c71a43aef oprofile/daemon doesn't build for x86_64.
We'll probably remove external/oprofile soon, but this gets us closer
to being able to turn on an x86_64 continuous build in the meantime.

Change-Id: Ic1d5331d41dafee9ffed222dc332afed2d4ae356
2014-03-13 11:26:26 -07:00
Ying Wang
579ea43d87 Remove external/wpa_supplicant_8 and external/android-clat
from 64_bit_blacklist.mk.
They now build fine for 64-bit.

Change-Id: Ib73c8465b72cc7b40dae21441c3ea0bd25b7e6ba
2014-03-13 11:26:26 -07:00
Elliott Hughes
7813000d49 Take libcore off the LP64 blacklist.
Change-Id: I34bc49370ecdd37f83927c3829c775e404bcbd73
2014-03-13 11:26:26 -07:00
Colin Cross
9bdcdff615 HACK: add 64-bit directory blacklist
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
2014-03-13 11:26:26 -07:00
Colin Cross
c92f1407a1 add support for module supported or unsupported target architectures
Add four new variables for module makefiles:

LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for
one or more architectures.  Any architecture not in the list will be
not attempt to build the module.  The expected use case is prebuilts
that are only suitable for a single architecture, or modules like llvm
that need per-architecture support.

LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be
built for one or more architectures.

LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN
are the same, but warn that the arch is not supported, which is useful
for modules that are critical but not yet working.

The logic for whether or not to build an architecture is fairly
complicated, so this patch consolidates it into module_arch_supported.mk

Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-03-13 11:26:04 -07:00
Dmitriy Ivanov
96ad54d132 am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
* commit 'd842e6d6c35fc7b0320e2e9ceb69caa71daf040a':
  Add TARGET_2ND_ARCH to dumpvar
2014-03-13 15:54:41 +00:00
Narayan Kamath
cc8d6dab9a Merge "Revert "Remove external/chromium from the 64 bit blacklist."" 2014-03-13 09:29:52 +00:00
Narayan Kamath
c00ab8e012 Revert "Remove external/chromium from the 64 bit blacklist."
This reverts commit 27bf51144a.

Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c
2014-03-13 09:29:22 +00:00
Narayan Kamath
252496247f Merge "Remove external/chromium from the 64 bit blacklist." 2014-03-13 09:05:32 +00:00
Ying Wang
895520a782 am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
* commit '446f00c9e1a8ef2b119617ab63c15a6aa40c733b':
  Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
2014-03-13 01:55:11 +00:00
Ian Rogers
bf9670a38b am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
* commit '21060b30993b975084ea7a7c35a6df23cf0e5ea7':
  Define __STDC_CONSTANT_MACROS globally to work around host build differences.
2014-03-13 01:54:43 +00:00
Ian Rogers
dae5ebc949 am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
* commit 'bc39fd5cab47388797ee7638920766e91fe0b100':
  Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
2014-03-13 01:54:41 +00:00
Dmitriy Ivanov
d5cd1e2ecf Add TARGET_2ND_ARCH to dumpvar
Change-Id: Ida87a61cceb55b7ebc28735b4688a03a10c01096
2014-03-12 11:13:41 -07:00
Narayan Kamath
27bf51144a Remove external/chromium from the 64 bit blacklist.
This isn't the same as chromium_org (which is used by the
webview). This is a 3 year old snapshot of the net stack which
compiles under 64 bit. It's currently used on aosp master by
libstagefright_chromium_http.

This project can be removed if the changes that remove the
chromium dependency are cherry-picked to aosp/master.

Change-Id: I5d0f9ed03ea9842b47d980d77ea32bc7a3f6998f
2014-03-12 14:43:38 +00:00
Andrew Hsieh
cbe162e914 Fix HOST_TOOLCHAIN_PREFIX
Previously HOST_TOOLCHAIN_PREFIX can't accept toolchain in arch-os-*-gcc
format.  Fix it so we can try out new host toolchain, eg.

  HOST_TOOLCHAIN_PREFIX=prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux- make

Change-Id: Ic1092593036c41d5471e788654fb4e0991dd7e40
2014-03-12 19:27:59 +08:00
Dianne Hackborn
264d4001e7 am 7503e736: 4.4.3 is MR2, version boogaloo!
* commit '7503e736ebb0161a23ff0ee39a307cd436ea8afc':
  4.4.3 is MR2, version boogaloo!
2014-03-11 23:22:38 +00:00
Dianne Hackborn
7503e736eb 4.4.3 is MR2, version boogaloo!
Change-Id: I1a06850393247183fa3db9fbd3fbc8774f181a26
2014-03-11 14:54:09 -07:00
Ian Rogers
7d5d35d465 am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
* commit 'a520bfbeb65b307da42abb079911311096fef20c':
  Define __STDC_LIMIT_MACROS globally to work around host build differences.
2014-03-11 18:52:52 +00:00
Ying Wang
04691b3947 am 61cf1df7: am 60ef9d5b: Merge "jdk error message should not mention the version"
* commit '61cf1df7edbb9d52a6f151b011633b2859213c35':
  jdk error message should not mention the version
2014-03-11 18:52:31 +00:00
Nicolas Geoffray
e7be6ffa98 am db48d145: am 247dd0c4: Merge "Do not remove the generated .hpp file from yacc."
* commit 'db48d145841afb9b9b6d1c124191a1681d6b4f39':
  Do not remove the generated .hpp file from yacc.
2014-03-11 18:29:45 +00:00
Nicolas Geoffray
6b92a7018e am b11697d3: am 68d38154: Merge "Remove host-prefix command line argument to dex2oat."
* commit 'b11697d30778db51d476aedd28b0e2c65eb241e3':
  Remove host-prefix command line argument to dex2oat.
2014-03-11 18:29:12 +00:00
Andrew Hsieh
f25a976fa6 am 12493c89: am 6808c260: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
* commit '12493c892e59d826eec41caea6bc90a5778bb672':
  Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
2014-03-11 18:28:59 +00:00
Nicolas Geoffray
5ebef36646 am d85ef325: am 460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files."
* commit 'd85ef325de805996050170b3ce1cc199cba7c980':
  Extend YACC and LEX handling to .yy and .ll files.
2014-03-11 18:28:25 +00:00
Ying Wang
009f48b00f am a6230641: am 26bcd640: Merge "Try to catch more misuse of ."
* commit 'a623064131f23412daa0ac4b333320e2e30d85f0':
  Try to catch more misuse of $(my-dir).
2014-03-11 18:17:42 +00:00
Ying Wang
8ec7041127 am 8e286fbf: am cf1b7d4b: Merge "Select src arch for prebuilts."
* commit '8e286fbfc712ed695008f786592fe83e4a1331a7':
  Select src arch for prebuilts.
2014-03-11 18:16:49 +00:00
Ying Wang
9638890678 am 66a9b789: Merge "Include privileged apps with app zip file."
* commit '66a9b789703b7fac5f57fa318209dc8211f800f7':
  Include privileged apps with app zip file.
2014-03-11 18:16:01 +00:00
Ying Wang
84ee17bd65 am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."
* commit 'bbe5f88e1df32d1c998b424eb05ab99cc35c1e8b':
  Conditionally include the 'samplecode' rules.
2014-03-11 18:08:18 +00:00
Torne (Richard Coles)
bbc3a3eda3 am 63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
* commit '630020883abc6c8b2c13876e3195ed6abcf4890f':
  Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
2014-03-11 18:08:03 +00:00
Ying Wang
d98291e74e am 66331624: Merge "Fix prebuilt library dependency for multilib build"
* commit '66331624b5422a608607a9924f174ba533573032':
  Fix prebuilt library dependency for multilib build
2014-03-11 18:07:57 +00:00
Ying Wang
64255e639b am f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"
* commit 'f1ff3abd83cbc9884082c09bb9b1d4a5080134c1':
  Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
2014-03-11 17:12:21 +00:00
Ying Wang
ba8b377d89 Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Still keep WITHOUT_CLANG, which enables both.

Bug: 13402154
Change-Id: I32cb668223997719875751bf3d64f592d6086830
2014-03-10 18:59:12 -07:00