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

3760 commits

Author SHA1 Message Date
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
9f9204ec3a am a4d70f94: am 0105f1cc: am 07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE" 
* commit 'a4d70f9435764339695e9264ac5d815a894e1e9f':
  collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
 2014-01-27 23:05:22 +00: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
f23971ede6 am 3512ed49: am f2777de6: am 18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES." 
* commit '3512ed49a0cecd103de62eb9869e60dab144a6fb':
  Support arch-specific LOCAL_C_INCLUDES.
 2014-01-27 19:49:25 +00: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
088319dd22 am dda94546: am 4a1f42d7: am 7c7f28e7: Merge changes Ib1d950e1,I3d020a3c,Ic9594718 
* commit 'dda94546e4682627a9446ee7523a1411c1841d7a':
  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:57:00 +00: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
d6486e664c am 0f561354: am 5cc096b7: am 2c0260ab: Merge "build: print module that has unhandled install path" 
* commit '0f5613546817fd9a8879f7dbefac07fbf1258192':
  build: print module that has unhandled install path
 2014-01-24 22:00:50 +00:00
Ying Wang
62b0e9299b am 81ea7ed4: am f34c4c71: am 125ddab1: Merge "build: use correct arm vs thumb arguments for 2nd arch builds" 
* commit '81ea7ed4625f461cfd9b08a426b4b85e2718039c':
  build: use correct arm vs thumb arguments for 2nd arch builds
 2014-01-24 21:57:19 +00: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
a6403a763c am d9926a93: am 4e08d304: am f2044b41: Merge "build: use arm kernel headers for arm 2nd arch builds" 
* commit 'd9926a93ae0869a3bea9c0755b89708330bd6edb':
  build: use arm kernel headers for arm 2nd arch builds
 2014-01-24 21:53:51 +00:00
Ying Wang
a286db0b00 am 12ebfbcd: am 0c09d5b2: am e778ec89: Merge "Support arch-specific LOCAL_ variables" 
* commit '12ebfbcd9daebda6ebace823ced79f795dd401d1':
  Support arch-specific LOCAL_ variables
 2014-01-24 21:53:50 +00:00
Ying Wang
0f595d354b am ebbec848: am 23752157: am 3beb831c: Merge "Make sure to install the .odex when running "make <module_name>"" 
* commit 'ebbec848be133dcf8dabe9ea9f1a48646bd72740':
  Make sure to install the .odex when running "make <module_name>"
 2014-01-24 21:53:49 +00:00
Ying Wang
9b3be84c95 am fbb8b629: am 746d1f73: am 9e21bcdc: Merge "Support to build executables for TARGET_2ND_ARCH" 
* commit 'fbb8b629bed067420ceb987513394051d3b395bb':
  Support to build executables for TARGET_2ND_ARCH
 2014-01-24 21:53:48 +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
2ca5c75ba1 am 443c9dc8: am c236e00e: am 7da9740a: Merge "Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources" 
* commit '443c9dc818e6f0db222b2a34962eafde4ff22991':
  Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources
 2014-01-24 21:48:09 +00:00
Ying Wang
c3536bff2c am 778c138b: am 52afa28f: am a07de328: Merge "Set up rules to build shared libraries for TARGET_2ND_ARCH" 
* commit '778c138b257a3daf2c1ca921abe0843129a96bf5':
  Set up rules to build shared libraries for TARGET_2ND_ARCH
 2014-01-24 21:48:08 +00:00
Ying Wang
0a70ec8e6f am 095bc78e: am 382ad032: am e7345edc: Merge "Set up rules to build static libraries for TARGET_2ND_ARCH" 
* commit '095bc78ed503d031901dbe0770e48920169ece18':
  Set up rules to build static libraries for TARGET_2ND_ARCH
 2014-01-24 21:48:07 +00:00
Ying Wang
ab4408a950 am add64250: am d6c4fcab: am 732bdb28: Merge "Load compiler environment for a second arch." 
* commit 'add64250b230a859610d5a157a03adf85cb128c5':
  Load compiler environment for a second arch.
 2014-01-24 21:48:06 +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
Ying Wang
add64250b2 am d6c4fcab: am 732bdb28: Merge "Load compiler environment for a second arch." 
* commit 'd6c4fcabf6b132927f6980569427f9475a403ed3':
  Load compiler environment for a second arch.
 2014-01-24 21:45:40 +00:00
Colin Cross
b34911cadf build: print module that has unhandled install path 
Print the name of the module that is providing an unhandled install
path.

Change-Id: I0e8b02f01de1dde715f0985034ad943f793218ba

Conflicts:
	core/base_rules.mk
 2014-01-24 13:44:11 -08:00
Ying Wang
c236e00e88 am 7da9740a: Merge "Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources" 
* commit '7da9740acdf30356512bea414d4af6efd6db3e40':
  Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources
 2014-01-24 13:43:31 -08:00
Ying Wang
52afa28f31 am a07de328: Merge "Set up rules to build shared libraries for TARGET_2ND_ARCH" 
* commit 'a07de328e0557068f2503ed0aa20ddc684ed1c40':
  Set up rules to build shared libraries for TARGET_2ND_ARCH
 2014-01-24 13:43:30 -08:00
Ying Wang
382ad032cb am e7345edc: Merge "Set up rules to build static libraries for TARGET_2ND_ARCH" 
* commit 'e7345edc1100ffd33e6434b0edc9d3b0f09d5c94':
  Set up rules to build static libraries for TARGET_2ND_ARCH
 2014-01-24 13:43:29 -08:00
Ying Wang
d6c4fcabf6 am 732bdb28: Merge "Load compiler environment for a second arch." 
* commit '732bdb28f2e39cf97b22271481b2249b22add87f':
  Load compiler environment for a second arch.
 2014-01-24 13:43:29 -08:00
Colin Cross
6e087a339b build: use correct arm vs thumb arguments for 2nd arch builds 
Set arm_objects_mode and normal_objects_mode when building a
module for arm when it is the 2nd arch.

Change-Id: I5f7df519b6e1dde6cbf92d106681f07a58e1f1f2
 2014-01-24 13:42:01 -08:00
Colin Cross
c3256c770d build: use arm kernel headers for arm 2nd arch builds 
Compiling for arm requires using the arm kernel headers and not
the aarch64 kernel headers.  Add $(combo_2nd_arch_prefix) to get
asm-$(TARGET_2ND_ARCH) when arm is the 2nd arch.

Change-Id: I15270d0ef35e48c034bf4d0d5e35b76f67b2a8e1
 2014-01-24 13:41:00 -08:00
Ying Wang
b8e0185489 Support arch-specific LOCAL_ variables 
With those variables, you can set up different values for TARGET_ARCH
and TARGET_2ND_ARCH.
Also fixed a couple of variables.

Bug: 11654773
Change-Id: I4c7684a562cd5877d18f67d4f848b8df07d0103b

Conflicts:
	core/base_rules.mk
 2014-01-24 13:38:34 -08:00
Ying Wang
5c7fed28f2 Make sure to install the .odex when running "make <module_name>" 
Change-Id: I64195294dad15b7d379d667f4c4738c2808fd384
 2014-01-24 13:37:11 -08:00
Ying Wang
dd814bf8c2 Support to build executables for TARGET_2ND_ARCH 
By default, an executable is built for TARGET_ARCH.
To build it for TARGET_2ND_ARCH in a 64bit product, use:
LOCAL_32BIT_ONLY := true
To skip a module for TARGET_2ND_ARCH, use:
LOCAL_NO_2ND_ARCH := true

Bug: 11654773
Change-Id: Ieb293d25b21024bfe1b554044df338e064ac7b46
 2014-01-24 13:36:30 -08:00
Ying Wang
ec6d6262ac Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources 
Now the RS generated sources are only appended to my_generated_sources.

Bug: 11654773
Change-Id: If8dbf3c08fed0b9945dd32b8c809331c17c4bc85
 2014-01-24 13:35:47 -08:00
Ying Wang
4d2cc665ea Set up rules to build shared libraries for TARGET_2ND_ARCH 
The rules for the 2nd arch are set up in the second inclusion
of shared_library_internal.mk.
Intermediate fils of libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/
and the built libfoo.so will be in
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib.

Bug: 11654773
Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
 2014-01-24 13:35:30 -08:00
Ying Wang
6ef6519170 Set up rules to build static libraries for TARGET_2ND_ARCH 
The rules for the 2nd arch are set up in the second inclusion
of static_library_internal.mk.
libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/libfoo_intermediates/libfoo.a.

Bug: 11654773
Change-Id: I1d92733968fc442e9225b4df5bd1b551a81d89f7
 2014-01-24 13:35:09 -08:00
Ying Wang
1d274d2686 Load compiler environment for a second arch. 
This is the first step to build 32-bit libraries in a 64-bit product.
It will work like this:
1) In the product's BoardConfig.mk, define:
TARGET_2ND_ARCH, TARGET_2ND_ARCH_VARIANT, TARGET_2ND_CPU_VARIANT.
The build system uses those variables to set up an additional compiler
environment for the second arch.

2) When parsing Android.mks, the build system sets up rules to build a
module for both the 1st arch and the 2nd arch, unless it's explicitly
asked to skip so.
Android.mk will be adapted if there is additional rule of generating
source files.
The build system will accept arch-specific LOCAL_ variables, such as
LOCAL_CFLAGS_arm, LOCAL_CFLAGS_armv7-a-neon, LOCAL_CFLAGS_cortex-a15,
LOCAL_CFLAGS_aarch64 etc. Modules use such variables to set up build for
various archs at the same time.

3) Install binary of the 2nd arch by adding "<module_name>:32" to
PRODUCT_PACKAGES. All 2nd-arch libraries linked in by "<module_name>:32"
will be installed automatically.

Bug: 11654773
Change-Id: I2df63cd5463a07bf5358bee2a109f8fb9590fe30

Conflicts:
	core/combo/TARGET_linux-arm.mk
 2014-01-24 13:34:26 -08:00
Colin Cross
de89397b16 am 5119fcfc: am f81cc531: am d5227a83: Merge "build: rename aarch64 target to arm64" 
* commit '5119fcfc2052e9f3a5d4415759fb5bf252d651e8':
  build: rename aarch64 target to arm64
 2014-01-24 20:48:20 +00:00
Colin Cross
5119fcfc20 am f81cc531: am d5227a83: Merge "build: rename aarch64 target to arm64" 
* commit 'f81cc531b41617b91ef2c46b7f2fb1bf1abb8dc7':
  build: rename aarch64 target to arm64
 2014-01-24 20:45:41 +00:00
Colin Cross
f81cc531b4 am d5227a83: Merge "build: rename aarch64 target to arm64" 
* commit 'd5227a833cde624532ec34e8b25c29af001e427f':
  build: rename aarch64 target to arm64
 2014-01-24 12:42:35 -08:00
Colin Cross
4f0eb7d50c build: rename aarch64 target to arm64 
Rename aarch64 build targets to arm64.  The gcc toolchain is still
aarch64.

Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
 2014-01-23 22:39:38 -08:00
Ying Wang
4a814d0a69 am a0d68280: am f5db4548: am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
* commit 'a0d68280cae16645c2f16aeb6d8f614b76ba94a0':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
 2014-01-22 04:03:13 +00:00
Ying Wang
a0d68280ca am f5db4548: am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
* commit 'f5db454865c7b8cff22cc8faaeb5b983f059cb73':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
 2014-01-22 04:00:19 +00:00
Ying Wang
f5db454865 am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
* commit '62043de346dff2d31c58bc8c002699fc74d1351c':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
 2014-01-21 19:57:41 -08:00
Ying Wang
62043de346 Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 2014-01-22 03:48:59 +00:00
Ying Wang
06b3255118 Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
This reverts commit ca37190711.

Change-Id: I3a76f4cdf92ecbe3059bf5856cf341874e1393cf
 2014-01-22 03:48:27 +00:00
Ying Wang
6e8e82ea58 am 10515519: am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
* commit '10515519ee2a3eb50ef3c6054504972fa1bc1e00':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
 2014-01-21 20:41:21 +00:00
Ying Wang
10515519ee am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
* commit '70cc85533dacfaa499f39c417cfd78e3ed922414':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
 2014-01-21 20:37:50 +00:00
Ying Wang
70cc85533d am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
* commit '8d1f91fa548c80357fffbdbdd5dcccc3c461c9ec':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
 2014-01-21 12:36:33 -08:00
Ying Wang
8d1f91fa54 Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 2014-01-21 20:31:31 +00:00
Ying Wang
5f95f44268 am 20048318: am aa754868: am 6ec35451: Merge "Add missing paren in "java -version" check" 
* commit '20048318cda49fc9412be8fb2349354313090240':
  Add missing paren in "java -version" check
 2014-01-21 20:01:29 +00:00
Ying Wang
20048318cd am aa754868: am 6ec35451: Merge "Add missing paren in "java -version" check" 
* commit 'aa7548683bcd254e50cffc5baf00994e58919d64':
  Add missing paren in "java -version" check
 2014-01-21 19:58:09 +00:00
Ying Wang
aa7548683b am 6ec35451: Merge "Add missing paren in "java -version" check" 
* commit '6ec3545158f49f521c53c9474cfb28c1a1811fd3':
  Add missing paren in "java -version" check
 2014-01-21 11:54:58 -08:00
Brian Carlstrom
0cf57dc99f Add missing paren in "java -version" check 
Change-Id: Id66e795423e8d25b48ac996956748a93060ea5db
 2014-01-20 23:48:45 -08:00
Robert Craig
ca37190711 Fix filter rule when checking for apks in PRODUCT_COPY_FILES. 
PRODUCT_COPY_FILES entries can include the src:dest:owner
syntax versus src:dest. This causes the filter to miss
certain cases. Instead use the word-colon function to
grab the dest regardless of syntax.

Change-Id: I1f4e57a236c1db148bada0cfe5bd1e87bb1194d6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-01-17 09:13:50 -05:00
Chet Haase
585ce19d9d Add recyclerview to support libs docs 
Change-Id: Ibe863e4b1930670353e6e0658fbc83e694dec3a4
 2014-01-16 15:55:56 +00:00
Ying Wang
da9ef76b5d am a296a71e: am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings" 
* commit 'a296a71e0c344e95f2d4dfe59d850a55130fe58a':
  [MIPS] Reenable linker fatal-warnings
 2014-01-16 01:11:15 +00:00
Ying Wang
a296a71e0c am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings" 
* commit '166bc090ab0ac7ac7a620889fd96656be4ca69c1':
  [MIPS] Reenable linker fatal-warnings
 2014-01-15 17:08:22 -08:00
Chris Dearman
13eb1eb53d [MIPS] Reenable linker fatal-warnings 
Change-Id: I4efbb7d0b1026b49a9b8bf968dd4752fca8a543b
 2014-01-15 19:00:37 +00:00
Ying Wang
c4f4a5325f am 14af5526: am c4c71f06: Merge "Remove aprof support from the build system." 
* commit '14af5526b5001431af49e40be049b5475de64f15':
  Remove aprof support from the build system.
 2014-01-14 23:42:33 +00:00
Ying Wang
14af5526b5 am c4c71f06: Merge "Remove aprof support from the build system." 
* commit 'c4c71f06ab002c4b12042ba7752272311b62b0f9':
  Remove aprof support from the build system.
 2014-01-14 15:36:57 -08:00
Ying Wang
4587455075 Remove aprof support from the build system. 
This reverts the commit 70dc3e1d.

Change-Id: I480b005579805d2608d05dac41e32bb44642e813
 2014-01-14 14:26:05 -08:00
Ying Wang
adc66128dc am b6c57051: am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64." 
* commit 'b6c570510aa1d2747538fe734292873ed13f5b67':
  Install 64-bit libraries to /system/lib64.
 2014-01-14 20:10:16 +00:00
Ying Wang
b6c570510a am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64." 
* commit 'f5ce4fa983f08d42bbc5d96af4f86bce5c190f0c':
  Install 64-bit libraries to /system/lib64.
 2014-01-14 12:08:32 -08:00
Ying Wang
c634974d37 Install 64-bit libraries to /system/lib64. 
/system/lib always contains 32-bit libraries, and /system/lib64 (if
present) always contains 64-bit libraries.
Move things around a little bit, so TARGET_ARCH can be used to define
the build paths.

Bug: 11654773
Change-Id: I2edd91e162c7a20d7719d7bae15e5fa6c2a5b498
 2014-01-13 16:20:31 -08:00
Elliott Hughes
538009b26c am dda9d8ee: am 37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS." 
* commit 'dda9d8ee0fe580d663a4eaed49be5d39c3de2882':
  Remove obsolete CUSTOM_KERNEL_HEADERS.
 2014-01-11 00:50:44 +00:00
Elliott Hughes
dda9d8ee0f am 37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS." 
* commit '37c699c28a464561b186ab11a5af60214ae25d9a':
  Remove obsolete CUSTOM_KERNEL_HEADERS.
 2014-01-10 16:47:30 -08:00
Elliott Hughes
37c699c28a Merge "Remove obsolete CUSTOM_KERNEL_HEADERS." 2014-01-11 00:41:25 +00:00
Elliott Hughes
dddb566eba Remove obsolete CUSTOM_KERNEL_HEADERS. 
Change-Id: Id260dd351b90f065eee56e231d4c341b18c1b27f
 2014-01-10 16:35:08 -08:00
Ying Wang
ee2a10eb18 am 0650d4a2: am 987616ed: Merge "Fix x86_64 build" 
* commit '0650d4a2eadc96577b2e03fbda000ed5a340d8ac':
  Fix x86_64 build
 2014-01-10 17:40:26 +00:00
Ying Wang
0650d4a2ea am 987616ed: Merge "Fix x86_64 build" 
* commit '987616ed09adc65e6636f7a3a82fa7b38021b6e2':
  Fix x86_64 build
 2014-01-10 09:38:13 -08:00
Pavel Chupin
522b0a633c Fix x86_64 build 
Issue introduced here:
https://android-review.googlesource.com/#/c/71842/

Change-Id: I8a60641ff07173fcedf259df89aaaa4bc6d6ea3e
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
 2014-01-10 19:23:08 +04:00
Brian Carlstrom
1df8d17911 am 98c72521: am ad8271a8: Merge "Add support for ALTERNATE_JAVAC" 
* commit '98c7252113ad4adfc11bb500d737b96c0544106f':
  Add support for ALTERNATE_JAVAC
 2014-01-10 02:39:02 +00:00
Brian Carlstrom
98c7252113 am ad8271a8: Merge "Add support for ALTERNATE_JAVAC" 
* commit 'ad8271a8e6a1f050c1852d6dc3df0eb6777e5606':
  Add support for ALTERNATE_JAVAC
 2014-01-09 18:36:22 -08:00
Brian Carlstrom
ad8271a8e6 Merge "Add support for ALTERNATE_JAVAC" 2014-01-10 02:31:26 +00:00
Ying Wang
02e4bb6b10 am cb5f9a28: am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules." 
* commit 'cb5f9a282e713096104e9d7b18bb028f926dbd2a':
  Define PRIVATE_TARGET_ variables for only target modules.
 2014-01-10 00:34:56 +00:00
Ying Wang
cb5f9a282e am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules." 
* commit 'a26ea82e6a226575f19fec6b5bea111cbe20c233':
  Define PRIVATE_TARGET_ variables for only target modules.
 2014-01-09 16:32:07 -08:00