Colin Cross
4b764993a9
pdk: add android_common.jar
...
Add android_common.jar to the pdk java libraries to allow partners
to build test apps against it.
Change-Id: I3f3c0f6ef086489aec293e10b0d707845b174655
2014-01-29 10:01:37 -08:00
Elliott Hughes
f7784e4617
am 1a0e8501
: am 1a731adf
: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
...
* commit '1a0e850141fe19e1f1d503822893b8d66c0bca69':
Fix KERNEL_HEADERS_ARCH for mips and x86.
2014-01-28 21:35:25 +00:00
Elliott Hughes
1a0e850141
am 1a731adf
: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
...
* commit '1a731adf943bc716cc7b9c95b321db02ad7216db':
Fix KERNEL_HEADERS_ARCH for mips and x86.
2014-01-28 21:29:52 +00:00
Elliott Hughes
1a731adf94
Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
2014-01-28 21:23:07 +00:00
Elliott Hughes
171e940c7a
Fix KERNEL_HEADERS_ARCH for mips and x86.
...
arm and arm64 have distinct headers, but mips and mip64, and x86 and x86_64
use headers that work for both widths. So where arm/arm64 need to handle the
second architecture case specially, all we need to do for the others is
hard-code the name. (x86_64.mk already hard-codes x86; we need to change
x86.mk for the case where we're building the 32-bit binaries for a mixed
system. mips64.mk doesn't exist yet, but when it does, it'll hard-code
just plain "mips" too.)
Change-Id: Ia6b9f77b4eb2c78729b454045875c409e0ea8197
2014-01-28 13:10:19 -08:00
Brian Carlstrom
dc5dd9b47f
am d3737d07
: am 49eb4409
: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
...
* commit 'd3737d07c8adb0848dcddb7df03d1e6b4378ab93':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
2014-01-28 20:52:17 +00:00
Brian Carlstrom
d3737d07c8
am 49eb4409
: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
...
* commit '49eb440980db6680ec08c48b416e37e937bf9003':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
2014-01-28 20:50:19 +00:00
Brian Carlstrom
8fb5dfc5c7
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
...
(cherry-picked from commit cd337c71ee65b17529a67af34d4c0b2824a4f175)
Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b
2014-01-28 11:29:58 -08:00
Colin Cross
cb1ad44566
am 0d24616d
: am cdd14758
: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
...
* commit '0d24616dd1b29e016aaae86761574fd88d701b6d':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
2014-01-28 02:34:05 +00:00
Colin Cross
0d24616dd1
am cdd14758
: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
...
* commit 'cdd1475834156b2e45b73ae86a949efa6c1215eb':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
2014-01-28 02:31:18 +00:00
Colin Cross
8f47fc379e
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
...
To ease the transition between toolchains, allow a target to specify
a list of cflags that the toolchain does not support. These will be
filtered out of the cflags provided by the module.
Add TARGET_GLOBAL_UNSUPPORTED_CFLAGS := -fstack-protector for the
aarch64 toolchain, it does not yet suport -fstack-protector.
Change-Id: I168d0c6f131326fad305ec86fad46e6a3e03295a
2014-01-27 18:21:12 -08:00
Elliott Hughes
69c36ee7a8
am 4fbf23ef
: am 0a3cf1a0
: Merge "Remove libthread_db from the default include path."
...
* commit '4fbf23ef8267849ce88217a256b394de3904a4f6':
Remove libthread_db from the default include path.
2014-01-28 00:54:33 +00:00
Elliott Hughes
4fbf23ef82
am 0a3cf1a0
: Merge "Remove libthread_db from the default include path."
...
* commit '0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103':
Remove libthread_db from the default include path.
2014-01-28 00:43:29 +00:00
Elliott Hughes
2f8dcdd961
Remove libthread_db from the default include path.
...
This should never have been on the default include path.
The NDK statically links its own libthread_db, so I'm removing
bionic's unused copy from devices.
Bug: 11882807
Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a
2014-01-27 15:45:17 -08:00
Colin Cross
4695598df1
am ae49acbd
: am 1acb1b64
: Merge changes I62504bad,I16208cca,I4e4ceec6
...
* commit 'ae49acbde766e2e683d3dd026e69f2416da766b1':
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
2014-01-27 23:43:33 +00:00
Colin Cross
ae49acbde7
am 1acb1b64
: Merge changes I62504bad,I16208cca,I4e4ceec6
...
* commit '1acb1b64b9be43503fa2a9949858b8bb36417e32':
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
2014-01-27 15:40:22 -08:00
Colin Cross
1acb1b64b9
Merge changes I62504bad,I16208cca,I4e4ceec6
...
* changes:
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
2014-01-27 23:35:01 +00:00
Ying Wang
ae1c7d9607
am 50c548c8
: am 25a16fe8
: Merge "Don\'t modify LOCAL_MODULE_TAGS."
...
* commit '50c548c8f4e0df0c3a04e2b1cc91d79e067d940e':
Don't modify LOCAL_MODULE_TAGS.
2014-01-27 23:32:44 +00:00
Ying Wang
50c548c8f4
am 25a16fe8
: Merge "Don\'t modify LOCAL_MODULE_TAGS."
...
* commit '25a16fe80ee7795c4763045061779f3c7068813d':
Don't modify LOCAL_MODULE_TAGS.
2014-01-27 15:25:35 -08:00
Ying Wang
25a16fe80e
Merge "Don't modify LOCAL_MODULE_TAGS."
2014-01-27 23:20:06 +00:00
Ying Wang
37bd1f2d83
Don't modify LOCAL_MODULE_TAGS.
...
Change-Id: Id70d48c1d7abf02139925bcb3208515ea1a082b9
2014-01-27 15:19:09 -08:00
Ying Wang
a4d70f9435
am 0105f1cc
: am 07b16c0d
: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
...
* commit '0105f1cc9aa2ea3c683c197b18747f5b04310c27':
collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
2014-01-27 23:01:02 +00:00
Ying Wang
0105f1cc9a
am 07b16c0d
: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
...
* commit '07b16c0d5be77e53325a9f93c2f7f68632417792':
collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
2014-01-27 14:57:57 -08:00
Colin Cross
d826264621
add new gen/ directory for generated sources
...
Allow modules to generate source into $OUT/gen, which will then
be copied into $OUT/obj and $OUT/obj_$(TARGET_2ND_ARCH) as
necessary. This allows a single build rule invocation that includes
generated source to build for the first and second architectures.
Modules will need to change calls to local-intermediates-dir into
local-generated-sources-dir.
Change-Id: I62504bad9454b3d9fde7b84ab9f0a487a2ecf0bf
2014-01-27 14:45:44 -08:00
Colin Cross
d0378b3f2d
warn on LOCAL_MODULE_PATH in multiarch shared libraries
...
Using LOCAL_MODULE_PATH in a shared library module while building a
multiarch target will cause build rules for both architectures to install
into the same path. Warn and suggest LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I16208ccada6d43a26a342af35096f49d8df26e81
2014-01-27 14:43:24 -08:00
Colin Cross
639c336dc1
Support LOCAL_MODULE_RELATIVE_PATH
...
Most users of LOCAL_MODULE_PATH are setting a subdirectory of the
normal install path, for example to install HALs into system/lib/hw.
This is problematic for multiarch builds, where the install location
depends on the arch. Allow modules to specify LOCAL_MODULE_RELATIVE_PATH.
HALs will generally use:
LOCAL_MODULE_RELATIVE_PATH := hw
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
2014-01-27 14:43:14 -08:00
Andrew Boie
f3ec9ed045
collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
...
We have no rigorous way to detect whether the code referenced for this
mechanism changes in between builds. So declare this as a phony target
so that it is rebuilt every time.
Change-Id: Ie1670d96895719d406e7b0defd53ba3cd224dd83
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2014-01-27 12:25:43 -08:00
Ying Wang
3512ed49a0
am f2777de6
: am 18294fbf
: Merge "Support arch-specific LOCAL_C_INCLUDES."
...
* commit 'f2777de63984114f30a3d4d73bacd8e4059ea5ea':
Support arch-specific LOCAL_C_INCLUDES.
2014-01-27 19:30:25 +00:00
Ying Wang
f2777de639
am 18294fbf
: Merge "Support arch-specific LOCAL_C_INCLUDES."
...
* commit '18294fbf8c133aaaa5a97a6f36ab92d41aa8e13a':
Support arch-specific LOCAL_C_INCLUDES.
2014-01-27 11:20:13 -08:00
Ying Wang
dbdafdb865
Support arch-specific LOCAL_C_INCLUDES.
...
Bug: 11654773
Change-Id: I89c7ce7ff8bea15cb81f9cd9b0188b54beed3422
2014-01-27 10:27:19 -08:00
Colin Cross
dda94546e4
am 4a1f42d7
: am 7c7f28e7
: Merge changes Ib1d950e1,I3d020a3c,Ic9594718
...
* commit '4a1f42d70e1675ce531a1e9df3665b81e5a996c6':
Add 2nd arch directories for apps
Set up rules to build prebuilts for TARGET_2ND_ARCH
Set up rules to build packages for TARGET_2ND_ARCH
2014-01-25 00:54:37 +00:00
Colin Cross
4a1f42d70e
am 7c7f28e7
: Merge changes Ib1d950e1,I3d020a3c,Ic9594718
...
* commit '7c7f28e71044ca04d368dec626faba37fe74818d':
Add 2nd arch directories for apps
Set up rules to build prebuilts for TARGET_2ND_ARCH
Set up rules to build packages for TARGET_2ND_ARCH
2014-01-24 16:52:14 -08:00
Colin Cross
d9574462d8
Add 2nd arch directories for apps
...
Apps built for 2nd arch install in the same directories as when
built for the 1st arch.
Change-Id: Ib1d950e186eef88212b44d04e6bc6c30a3d56155
2014-01-24 16:44:06 -08:00
Colin Cross
0b70c4374c
Set up rules to build prebuilts for TARGET_2ND_ARCH
...
Prebuilts built for the 2nd arch will install into 2nd arch
directories.
Change-Id: I3d020a3c1fb0f2eb0579933f8a66e410e66fdd44
2014-01-24 16:44:02 -08:00
Colin Cross
2343cfbe3d
Set up rules to build packages for TARGET_2ND_ARCH
...
Packages built for the 2nd arch will depend on jni libraries
build for the 2nd arch.
Change-Id: Ic9594718849b2577920c500c35d46150eb948c8d
2014-01-24 16:04:19 -08:00
Ying Wang
0f56135468
am 5cc096b7
: am 2c0260ab
: Merge "build: print module that has unhandled install path"
...
* commit '5cc096b73bd563b470f4255edf7136c8fda1d0f0':
build: print module that has unhandled install path
2014-01-24 21:57:09 +00:00
Ying Wang
5cc096b73b
am 2c0260ab
: Merge "build: print module that has unhandled install path"
...
* commit '2c0260abc7099c79646928cc5a60eeba282736ad':
build: print module that has unhandled install path
2014-01-24 13:53:47 -08:00
Ying Wang
81ea7ed462
am f34c4c71
: am 125ddab1
: Merge "build: use correct arm vs thumb arguments for 2nd arch builds"
...
* commit 'f34c4c71b8edb7811bbad495836f3b96a8ff89e1':
build: use correct arm vs thumb arguments for 2nd arch builds
2014-01-24 21:53:39 +00:00
Ying Wang
f34c4c71b8
am 125ddab1
: Merge "build: use correct arm vs thumb arguments for 2nd arch builds"
...
* commit '125ddab1fbf084d25c1fa2c43c735f4ff4636f80':
build: use correct arm vs thumb arguments for 2nd arch builds
2014-01-24 13:50:20 -08:00
Ying Wang
d9926a93ae
am 4e08d304
: am f2044b41
: Merge "build: use arm kernel headers for arm 2nd arch builds"
...
* commit '4e08d3049be8e04e6043241d01b7007c63312bd3':
build: use arm kernel headers for arm 2nd arch builds
2014-01-24 21:50:15 +00:00
Ying Wang
12ebfbcd9d
am 0c09d5b2
: am e778ec89
: Merge "Support arch-specific LOCAL_ variables"
...
* commit '0c09d5b2ab36e1c188c40ee809e3d5e9cadc35a5':
Support arch-specific LOCAL_ variables
2014-01-24 21:50:14 +00:00
Ying Wang
ebbec848be
am 23752157
: am 3beb831c
: Merge "Make sure to install the .odex when running "make <module_name>""
...
* commit '23752157bc4b28b431f04e2b040db55aba404fb8':
Make sure to install the .odex when running "make <module_name>"
2014-01-24 21:50:13 +00:00
Ying Wang
fbb8b629be
am 746d1f73
: am 9e21bcdc
: Merge "Support to build executables for TARGET_2ND_ARCH"
...
* commit '746d1f732f4d933addb08d5039095edb07f56f84':
Support to build executables for TARGET_2ND_ARCH
2014-01-24 21:50:12 +00:00
Ying Wang
4e08d3049b
am f2044b41
: Merge "build: use arm kernel headers for arm 2nd arch builds"
...
* commit 'f2044b41cf11e584ab5df87b6a11f04ae26c6865':
build: use arm kernel headers for arm 2nd arch builds
2014-01-24 13:46:57 -08:00
Ying Wang
0c09d5b2ab
am e778ec89
: Merge "Support arch-specific LOCAL_ variables"
...
* commit 'e778ec89fd249e15608b7629963619d99e8a34bf':
Support arch-specific LOCAL_ variables
2014-01-24 13:46:56 -08:00
Ying Wang
23752157bc
am 3beb831c
: Merge "Make sure to install the .odex when running "make <module_name>""
...
* commit '3beb831c79b6051e881d17979981a846259bcd99':
Make sure to install the .odex when running "make <module_name>"
2014-01-24 13:46:55 -08:00
Ying Wang
746d1f732f
am 9e21bcdc
: Merge "Support to build executables for TARGET_2ND_ARCH"
...
* commit '9e21bcdc880e1769a4abe31836884f69752fc35e':
Support to build executables for TARGET_2ND_ARCH
2014-01-24 13:46:55 -08:00
Ying Wang
443c9dc818
am c236e00e
: am 7da9740a
: Merge "Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources"
...
* commit 'c236e00e88d2d8487327ef078e50ab1a9c102981':
Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources
2014-01-24 21:45:42 +00:00
Ying Wang
778c138b25
am 52afa28f
: am a07de328
: Merge "Set up rules to build shared libraries for TARGET_2ND_ARCH"
...
* commit '52afa28f315a3ad5a8dffb3c98df5e77e579e529':
Set up rules to build shared libraries for TARGET_2ND_ARCH
2014-01-24 21:45:41 +00:00
Ying Wang
095bc78ed5
am 382ad032
: am e7345edc
: Merge "Set up rules to build static libraries for TARGET_2ND_ARCH"
...
* commit '382ad032cbe807a84e799033d15b31d86c12c5cd':
Set up rules to build static libraries for TARGET_2ND_ARCH
2014-01-24 21:45:40 +00:00