tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
15161 commits 1 branch 0 tags 119 MiB
Commit graph

3765 commits

Author SHA1 Message Date
Colin Cross
dc5249ab3c am 717de0f5: Merge "Fix installing 2nd arch shared libraries" 
* commit '717de0f553dc3c1a2baa0cc988af1adc5b26dba8':
  Fix installing 2nd arch shared libraries
 2014-02-06 00:01:37 +00:00
Colin Cross
5394bf1950 Fix installing 2nd arch shared libraries 
2ND_TARGET_DEPENDENCIES_ON_SHARED_LIBRARIES was not set,
which was causing the later += to act like = instead of
:=, and the dependencies would disappear as soon as
LOCAL_MODULE was cleared.

Change-Id: Idea291524fc06377deafec62f37d20eaa7f93bca
 2014-02-04 19:44:09 -08:00
Adam Lesinski
bebb2b54ce am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev 
* commit '7b734fd8d163f7a71254b909fbbcd358129924b7':
  Allow multiple asset directories in aapt
 2014-02-05 00:49:37 +00:00
Adam Lesinski
7b734fd8d1 Merge "Allow multiple asset directories in aapt" into klp-modular-dev 2014-02-05 00:47:00 +00:00
Adam Lesinski
64cf9807b9 Allow multiple asset directories in aapt 
AAPT already supports this.

Change-Id: I293c7543fb43b15eedf2162416da48915ce02db8
 2014-02-05 00:13:58 +00:00
Justin Koh
bbfebfad0d resolved conflicts for merge of 303d2755 to klp-modular-dev-plus-aosp 
Change-Id: I653cac50cf71b75d47974dde833468fa61024ae9
 2014-02-04 15:16:15 -08:00
Justin Koh
303d275591 Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT. 
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT, as discussed.

Change-Id: Ia2d8628c4e9ee6b3cf654c8bdfc966a4af5c573c
 2014-02-03 16:26:43 -08:00
Tim Murray
47f9b9bc29 am 5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base." 
* commit '5352018b0b115061bce7a2aac14780ffea3885c7':
  Add new rs directory to list of Java subdirs of fw/base.
 2014-02-03 22:44:31 +00:00
Tim Murray
5352018b0b Merge "Add new rs directory to list of Java subdirs of fw/base." 2014-02-03 22:35:54 +00:00
Ying Wang
1446cf93ed am a77456b8: Merge "Dedup the targets and dependencies of required modules." 
* commit 'a77456b8e8a5e66705e48e1ec4eebc1889553c6a':
  Dedup the targets and dependencies of required modules.
 2014-02-03 00:45:03 +00:00
Ying Wang
3136010cdd Dedup the targets and dependencies of required modules. 
For whatever reason, two modules may have the same file as their
installed module. In that case circular dependency is created if the two
modules have requited-by relation.

Change-Id: I15ed271ca3f3c343e4662182ded5ccc63d6c42cc
 2014-01-31 19:22:35 -08:00
Tim Murray
f6752d303f Add new rs directory to list of Java subdirs of fw/base. 
Change-Id: I3213a314e7700162e781526c0450678495442759
 2014-01-31 12:32:42 -08:00
Brian Carlstrom
a15fc8fd1a am 601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit '601d39b688bcbb1789e145d1b72753206c24d374':
  build: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-01-31 12:34:17 +00:00
Ian Rogers
1fee45f1af am e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds." 
* commit 'e854276dd19ee0ce139cc35f98b49189b7750b2d':
  Disable WITH_HOST_DALVIK on 64bit host builds.
 2014-01-31 12:17:16 +00:00
Narayan Kamath
b1aec05aae am ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds." 
* commit 'ad9209adff8d2f94c57387ee3d3abcff28049091':
  Define __STDC_FORMAT_MACROS on Windows host builds.
 2014-01-31 12:17:03 +00:00
Colin Cross
6a7699d5c6 am a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY" 
* commit 'a8e6166fa482782719dce28a9ae1869f017e7cee':
  build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
 2014-01-31 10:27:06 +00:00
Colin Cross
df313a04a1 am 2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64" 
* commit '2dcaf9f489e5dba385ae4ab75c53d184a6fb780a':
  build: support LOCAL_*_32 and LOCAL_*_64
 2014-01-31 10:27:05 +00:00
Ian Rogers
eb02fa0a6b am 805cb8fa: Merge "Fix the host inttypes.h problem globally." 
* commit '805cb8fa40f71b3e1f6566bf10ca169d4a2ff86f':
  Fix the host inttypes.h problem globally.
 2014-01-31 10:26:52 +00:00
Brian Carlstrom
49f1fab8a5 build: Rename persist.sys.dalvik.vm.lib to allow new default 
Bug: 12798969
Change-Id: Ie73a3f2b6655d0ae3e3a905a1c64747343c525a0
 2014-01-30 13:16:37 -08:00
Ian Rogers
d206afecb8 Disable WITH_HOST_DALVIK on 64bit host builds. 
Change-Id: I8cea32fe5541c3223e7f317245aab3061e8ad444
 2014-01-30 08:55:17 -08:00
Ian Rogers
694b2b7b12 Define __STDC_FORMAT_MACROS on Windows host builds. 
Change-Id: I89b54a63c3f111b8242fe9e813d94a839c484195
 2014-01-29 21:37:37 -08:00
Colin Cross
78d642f426 build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY 
Rename for consistency with TARGET_IS_64_BIT.

Change-Id: I824dcaed0c1e88b8246bcffb21ab3f1772175926
 2014-01-29 18:35:23 -08:00
Colin Cross
44a752659c build: support LOCAL_*_32 and LOCAL_*_64 
Support the following new variables based on whether the current multilib
target is 32 bit or 64 bit:
LOCAL_CFLAGS_32
LOCAL_CFLAGS_64
LOCAL_LDFLAGS_32
LOCAL_LDFLAGS_64
LOCAL_ASFLAGS_32
LOCAL_ASFLAGS_64
LOCAL_C_INCLUDES_32
LOCAL_C_INCLUDES_64

Change-Id: Ia868d56dff114be301bf8297eec768675f186927
 2014-01-29 18:35:23 -08:00
Colin Cross
e39bb7ea46 am 190ebe94: Merge "pdk: add android_common.jar" into klp-volantis-dev 
* commit '190ebe94e1a3c18183fa1940e7599b4d6f70b470':
  pdk: add android_common.jar
 2014-01-30 00:59:55 +00:00
Colin Cross
190ebe94e1 Merge "pdk: add android_common.jar" into klp-volantis-dev 2014-01-30 00:53:56 +00:00
Ian Rogers
61e5059ef7 Fix the host inttypes.h problem globally. 
Bug: 12708004
Change-Id: I2c75647bac304b82e150c540b9e6c5568997596d
 2014-01-29 16:29:11 -08:00
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
07ada634a1 am 833188c1: am e7bd4f5c: am 472a4858: Merge "gtest needs -lpthread." 
* commit '833188c16ea5d2f12aa0108119c327d6cd31d4ea':
  gtest needs -lpthread.
 2014-01-29 01:55:36 +00:00
Elliott Hughes
833188c16e am e7bd4f5c: am 472a4858: Merge "gtest needs -lpthread." 
* commit 'e7bd4f5cdf5d1ac0c49d42ed41322f10e7f34f9b':
  gtest needs -lpthread.
 2014-01-29 01:53:14 +00:00
Elliott Hughes
e7bd4f5cdf am 472a4858: Merge "gtest needs -lpthread." 
* commit '472a48585ec1cfb66c5716f85b0efdf528b29f5d':
  gtest needs -lpthread.
 2014-01-29 01:50:34 +00:00
Elliott Hughes
472a48585e Merge "gtest needs -lpthread." 2014-01-29 01:45:17 +00:00
Elliott Hughes
52e52d1447 gtest needs -lpthread. 
Host gtests that don't use pthreads themselves need to be linked
against libpthread because gtest itself uses pthreads to ensure
thread-safety. (It can't know in advance whether the code under
test is going to spin up threads, so it has to be pessimistic.)

Change-Id: I14fb1098c163d7fe6ae9a9a0314acead4ec9383d
 2014-01-28 17:32:30 -08:00
Elliott Hughes
bc528c22b8 am f7784e46: am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86." 
* commit 'f7784e46170e90cb38ddbab15b7aa3a4a7e2d07d':
  Fix KERNEL_HEADERS_ARCH for mips and x86.
 2014-01-28 21:37:15 +00: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
1737b1ab5f am dc5dd9b4: am d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA" 
* commit 'dc5dd9b47fe2a24410b3e70d320655f1b5455966':
  build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
 2014-01-28 20:54:10 +00: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
23710e27bc am cb1ad445: am 0d24616d: am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS" 
* commit 'cb1ad445663d190e204330b596b52e4734d9dcf0':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
 2014-01-28 02:37:21 +00: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
6fe9a94989 am 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path." 
* commit '69c36ee7a8c1e3d8c7ca04d61f75d95585c58253':
  Remove libthread_db from the default include path.
 2014-01-28 00:59:15 +00: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
Colin Cross
8c89a9ff9c am 4695598d: am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6 
* commit '4695598df1fa11064a54421f60fee66032c673ee':
  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:46:39 +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