OSDN Git Service
Ying Wang [Mon, 27 Jan 2014 23:09:10 +0000 (23:09 +0000)]
am
9f9204ec: am
a4d70f94: am
0105f1cc: am
07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
* commit '
9f9204ec3aadfe7e4b54e52f560ed7c66f316891':
collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
Ying Wang [Mon, 27 Jan 2014 23:05:22 +0000 (23:05 +0000)]
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
Ying Wang [Mon, 27 Jan 2014 23:01:02 +0000 (23:01 +0000)]
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
Ying Wang [Mon, 27 Jan 2014 22:57:57 +0000 (14:57 -0800)]
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
Ying Wang [Mon, 27 Jan 2014 22:52:13 +0000 (22:52 +0000)]
Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
Andrew Boie [Fri, 13 Dec 2013 22:28:53 +0000 (14:28 -0800)]
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>
Ying Wang [Mon, 27 Jan 2014 19:55:25 +0000 (19:55 +0000)]
am
f23971ed: am
3512ed49: am
f2777de6: am
18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES."
* commit '
f23971ede66991f20e5ea24411872b0a296d82f8':
Support arch-specific LOCAL_C_INCLUDES.
Ying Wang [Mon, 27 Jan 2014 19:49:25 +0000 (19:49 +0000)]
am
3512ed49: am
f2777de6: am
18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES."
* commit '
3512ed49a0cecd103de62eb9869e60dab144a6fb':
Support arch-specific LOCAL_C_INCLUDES.
Ying Wang [Mon, 27 Jan 2014 19:30:25 +0000 (19:30 +0000)]
am
f2777de6: am
18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES."
* commit '
f2777de63984114f30a3d4d73bacd8e4059ea5ea':
Support arch-specific LOCAL_C_INCLUDES.
Ying Wang [Mon, 27 Jan 2014 19:20:13 +0000 (11:20 -0800)]
am
18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES."
* commit '
18294fbf8c133aaaa5a97a6f36ab92d41aa8e13a':
Support arch-specific LOCAL_C_INCLUDES.
Ying Wang [Mon, 27 Jan 2014 18:28:35 +0000 (18:28 +0000)]
Merge "Support arch-specific LOCAL_C_INCLUDES."
Ying Wang [Mon, 27 Jan 2014 18:27:19 +0000 (10:27 -0800)]
Support arch-specific LOCAL_C_INCLUDES.
Bug:
11654773
Change-Id: I89c7ce7ff8bea15cb81f9cd9b0188b54beed3422
Doug Zongker [Mon, 27 Jan 2014 18:01:06 +0000 (10:01 -0800)]
prefer releasetools.py from target_files zip
If the target_files zip for the target build contains a
META/releasetools.py (which it has since Nov 2013), prefer that over
using a releasetools.py from the local client.
Explicitly specifying the device-specific extensions path via
command-line options takes priority over both of the above mechanisms.
Change-Id: Ia068b0e2e06ede7da89ebe4315cdec592eb8995e
Colin Cross [Sat, 25 Jan 2014 00:58:58 +0000 (00:58 +0000)]
am
088319dd: am
dda94546: am
4a1f42d7: am
7c7f28e7: Merge changes Ib1d950e1,I3d020a3c,Ic9594718
* commit '
088319dd22ac4bc65eb284dfeeab368ac2e90ca9':
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
Colin Cross [Sat, 25 Jan 2014 00:57:00 +0000 (00:57 +0000)]
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
Colin Cross [Sat, 25 Jan 2014 00:54:37 +0000 (00:54 +0000)]
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
Colin Cross [Sat, 25 Jan 2014 00:52:14 +0000 (16:52 -0800)]
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
Colin Cross [Sat, 25 Jan 2014 00:46:33 +0000 (00:46 +0000)]
Merge changes Ib1d950e1,I3d020a3c,Ic9594718
* changes:
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
Colin Cross [Fri, 24 Jan 2014 21:37:07 +0000 (13:37 -0800)]
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
Colin Cross [Fri, 24 Jan 2014 21:34:51 +0000 (13:34 -0800)]
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
Colin Cross [Fri, 24 Jan 2014 21:33:39 +0000 (13:33 -0800)]
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
Ying Wang [Fri, 24 Jan 2014 22:21:47 +0000 (22:21 +0000)]
am
d6486e66: am
0f561354: am
5cc096b7: am
2c0260ab: Merge "build: print module that has unhandled install path"
* commit '
d6486e664c2b72106b9da30c31e6e3ce2df52195':
build: print module that has unhandled install path
Ying Wang [Fri, 24 Jan 2014 22:21:44 +0000 (22:21 +0000)]
am
62b0e929: am
81ea7ed4: am
f34c4c71: am
125ddab1: Merge "build: use correct arm vs thumb arguments for 2nd arch builds"
* commit '
62b0e9299bb77774a3e497e01451f951bcf60918':
build: use correct arm vs thumb arguments for 2nd arch builds
Ying Wang [Fri, 24 Jan 2014 22:21:43 +0000 (22:21 +0000)]
am
a6403a76: am
d9926a93: am
4e08d304: am
f2044b41: Merge "build: use arm kernel headers for arm 2nd arch builds"
* commit '
a6403a763ccdb3685fbf0215f9f8152b88bcc220':
build: use arm kernel headers for arm 2nd arch builds
Ying Wang [Fri, 24 Jan 2014 22:21:42 +0000 (22:21 +0000)]
am
a286db0b: am
12ebfbcd: am
0c09d5b2: am
e778ec89: Merge "Support arch-specific LOCAL_ variables"
* commit '
a286db0b00f7ee46cf9215f8d40282fc9368ba5f':
Support arch-specific LOCAL_ variables
Ying Wang [Fri, 24 Jan 2014 22:21:42 +0000 (22:21 +0000)]
am
0f595d35: am
ebbec848: am
23752157: am
3beb831c: Merge "Make sure to install the .odex when running "make <module_name>""
* commit '
0f595d354b6684fd4954dbfa83e17e1d1b707000':
Make sure to install the .odex when running "make <module_name>"
Ying Wang [Fri, 24 Jan 2014 22:16:49 +0000 (14:16 -0800)]
Merge commit '
9b3be84c' into manualmerge
Ying Wang [Fri, 24 Jan 2014 22:16:09 +0000 (22:16 +0000)]
am
2ca5c75b: am
443c9dc8: am
c236e00e: am
7da9740a: Merge "Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources"
* commit '
2ca5c75ba130e0e0b508ed07b7bc74a3cc28038f':
Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources
Ying Wang [Fri, 24 Jan 2014 22:14:19 +0000 (14:14 -0800)]
Merge commit '
c3536bff' into manualmerge
Ying Wang [Fri, 24 Jan 2014 22:11:35 +0000 (14:11 -0800)]
Merge commit '
0a70ec8e' into manualmerge
Ying Wang [Fri, 24 Jan 2014 22:08:24 +0000 (14:08 -0800)]
Merge commit '
ab4408a9' into manualmerge
Ying Wang [Fri, 24 Jan 2014 22:00:50 +0000 (22:00 +0000)]
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
Ying Wang [Fri, 24 Jan 2014 21:57:19 +0000 (21:57 +0000)]
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
Ying Wang [Fri, 24 Jan 2014 21:57:09 +0000 (21:57 +0000)]
am
5cc096b7: am
2c0260ab: Merge "build: print module that has unhandled install path"
* commit '
5cc096b73bd563b470f4255edf7136c8fda1d0f0':
build: print module that has unhandled install path
Ying Wang [Fri, 24 Jan 2014 21:53:51 +0000 (21:53 +0000)]
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
Ying Wang [Fri, 24 Jan 2014 21:53:50 +0000 (21:53 +0000)]
am
12ebfbcd: am
0c09d5b2: am
e778ec89: Merge "Support arch-specific LOCAL_ variables"
* commit '
12ebfbcd9daebda6ebace823ced79f795dd401d1':
Support arch-specific LOCAL_ variables
Ying Wang [Fri, 24 Jan 2014 21:53:49 +0000 (21:53 +0000)]
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>"
Ying Wang [Fri, 24 Jan 2014 21:53:48 +0000 (21:53 +0000)]
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
Ying Wang [Fri, 24 Jan 2014 21:53:47 +0000 (13:53 -0800)]
am
2c0260ab: Merge "build: print module that has unhandled install path"
* commit '
2c0260abc7099c79646928cc5a60eeba282736ad':
build: print module that has unhandled install path
Ying Wang [Fri, 24 Jan 2014 21:53:39 +0000 (21:53 +0000)]
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
Ying Wang [Fri, 24 Jan 2014 21:50:20 +0000 (13:50 -0800)]
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
Ying Wang [Fri, 24 Jan 2014 21:50:15 +0000 (21:50 +0000)]
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
Ying Wang [Fri, 24 Jan 2014 21:50:14 +0000 (21:50 +0000)]
am
0c09d5b2: am
e778ec89: Merge "Support arch-specific LOCAL_ variables"
* commit '
0c09d5b2ab36e1c188c40ee809e3d5e9cadc35a5':
Support arch-specific LOCAL_ variables
Ying Wang [Fri, 24 Jan 2014 21:50:13 +0000 (21:50 +0000)]
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>"
Ying Wang [Fri, 24 Jan 2014 21:50:12 +0000 (21:50 +0000)]
am
746d1f73: am
9e21bcdc: Merge "Support to build executables for TARGET_2ND_ARCH"
* commit '
746d1f732f4d933addb08d5039095edb07f56f84':
Support to build executables for TARGET_2ND_ARCH
Ying Wang [Fri, 24 Jan 2014 21:48:09 +0000 (21:48 +0000)]
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
Ying Wang [Fri, 24 Jan 2014 21:48:08 +0000 (21:48 +0000)]
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
Ying Wang [Fri, 24 Jan 2014 21:48:07 +0000 (21:48 +0000)]
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
Ying Wang [Fri, 24 Jan 2014 21:48:06 +0000 (21:48 +0000)]
am
add64250: am
d6c4fcab: am
732bdb28: Merge "Load compiler environment for a second arch."
* commit '
add64250b230a859610d5a157a03adf85cb128c5':
Load compiler environment for a second arch.
Ying Wang [Fri, 24 Jan 2014 21:46:57 +0000 (13:46 -0800)]
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
Ying Wang [Fri, 24 Jan 2014 21:46:56 +0000 (13:46 -0800)]
am
e778ec89: Merge "Support arch-specific LOCAL_ variables"
* commit '
e778ec89fd249e15608b7629963619d99e8a34bf':
Support arch-specific LOCAL_ variables
Ying Wang [Fri, 24 Jan 2014 21:46:55 +0000 (13:46 -0800)]
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>"
Ying Wang [Fri, 24 Jan 2014 21:46:55 +0000 (13:46 -0800)]
am
9e21bcdc: Merge "Support to build executables for TARGET_2ND_ARCH"
* commit '
9e21bcdc880e1769a4abe31836884f69752fc35e':
Support to build executables for TARGET_2ND_ARCH
Ying Wang [Fri, 24 Jan 2014 21:45:49 +0000 (21:45 +0000)]
Merge "build: print module that has unhandled install path"
Ying Wang [Fri, 24 Jan 2014 21:45:42 +0000 (21:45 +0000)]
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
Ying Wang [Fri, 24 Jan 2014 21:45:41 +0000 (21:45 +0000)]
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
Ying Wang [Fri, 24 Jan 2014 21:45:40 +0000 (21:45 +0000)]
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
Ying Wang [Fri, 24 Jan 2014 21:45:40 +0000 (21:45 +0000)]
am
d6c4fcab: am
732bdb28: Merge "Load compiler environment for a second arch."
* commit '
d6c4fcabf6b132927f6980569427f9475a403ed3':
Load compiler environment for a second arch.
Colin Cross [Thu, 23 Jan 2014 01:34:28 +0000 (17:34 -0800)]
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
Ying Wang [Fri, 24 Jan 2014 21:43:31 +0000 (13:43 -0800)]
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
Ying Wang [Fri, 24 Jan 2014 21:43:30 +0000 (13:43 -0800)]
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
Ying Wang [Fri, 24 Jan 2014 21:43:29 +0000 (13:43 -0800)]
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
Ying Wang [Fri, 24 Jan 2014 21:43:29 +0000 (13:43 -0800)]
am
732bdb28: Merge "Load compiler environment for a second arch."
* commit '
732bdb28f2e39cf97b22271481b2249b22add87f':
Load compiler environment for a second arch.
Ying Wang [Fri, 24 Jan 2014 21:42:42 +0000 (21:42 +0000)]
Merge "build: use correct arm vs thumb arguments for 2nd arch builds"
Colin Cross [Thu, 23 Jan 2014 01:36:05 +0000 (17:36 -0800)]
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
Ying Wang [Fri, 24 Jan 2014 21:41:25 +0000 (21:41 +0000)]
Merge "build: use arm kernel headers for arm 2nd arch builds"
Colin Cross [Wed, 22 Jan 2014 00:54:00 +0000 (16:54 -0800)]
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
Ying Wang [Fri, 24 Jan 2014 21:40:38 +0000 (21:40 +0000)]
Merge "Support arch-specific LOCAL_ variables"
Ying Wang [Fri, 24 Jan 2014 21:40:26 +0000 (21:40 +0000)]
Merge "Make sure to install the .odex when running "make <module_name>""
Ying Wang [Fri, 24 Jan 2014 21:40:12 +0000 (21:40 +0000)]
Merge "Support to build executables for TARGET_2ND_ARCH"
Ying Wang [Fri, 24 Jan 2014 21:39:59 +0000 (21:39 +0000)]
Merge "Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources"
Ying Wang [Fri, 24 Jan 2014 21:39:48 +0000 (21:39 +0000)]
Merge "Set up rules to build shared libraries for TARGET_2ND_ARCH"
Ying Wang [Fri, 24 Jan 2014 21:39:29 +0000 (21:39 +0000)]
Merge "Set up rules to build static libraries for TARGET_2ND_ARCH"
Ying Wang [Fri, 24 Jan 2014 21:39:14 +0000 (21:39 +0000)]
Merge "Load compiler environment for a second arch."
Ying Wang [Thu, 23 Jan 2014 23:09:04 +0000 (15:09 -0800)]
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
Ying Wang [Thu, 23 Jan 2014 00:50:21 +0000 (16:50 -0800)]
Make sure to install the .odex when running "make <module_name>"
Change-Id: I64195294dad15b7d379d667f4c4738c2808fd384
Ying Wang [Sat, 18 Jan 2014 00:17:28 +0000 (16:17 -0800)]
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
Ying Wang [Fri, 17 Jan 2014 00:21:03 +0000 (16:21 -0800)]
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
Ying Wang [Thu, 16 Jan 2014 20:36:34 +0000 (12:36 -0800)]
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
Ying Wang [Thu, 16 Jan 2014 00:02:16 +0000 (16:02 -0800)]
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
Ying Wang [Fri, 27 Dec 2013 19:09:36 +0000 (11:09 -0800)]
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
Colin Cross [Fri, 24 Jan 2014 21:24:54 +0000 (21:24 +0000)]
am
de89397b: am
5119fcfc: am
f81cc531: am
d5227a83: Merge "build: rename aarch64 target to arm64"
* commit '
de89397b1636b9d77cbcdea1cfb347251e1d5b0c':
build: rename aarch64 target to arm64
Colin Cross [Fri, 24 Jan 2014 20:48:20 +0000 (20:48 +0000)]
am
5119fcfc: am
f81cc531: am
d5227a83: Merge "build: rename aarch64 target to arm64"
* commit '
5119fcfc2052e9f3a5d4415759fb5bf252d651e8':
build: rename aarch64 target to arm64
Colin Cross [Fri, 24 Jan 2014 20:45:41 +0000 (20:45 +0000)]
am
f81cc531: am
d5227a83: Merge "build: rename aarch64 target to arm64"
* commit '
f81cc531b41617b91ef2c46b7f2fb1bf1abb8dc7':
build: rename aarch64 target to arm64
Colin Cross [Fri, 24 Jan 2014 20:42:35 +0000 (12:42 -0800)]
am
d5227a83: Merge "build: rename aarch64 target to arm64"
* commit '
d5227a833cde624532ec34e8b25c29af001e427f':
build: rename aarch64 target to arm64
Colin Cross [Fri, 24 Jan 2014 20:33:59 +0000 (20:33 +0000)]
Merge "build: rename aarch64 target to arm64"
Colin Cross [Wed, 22 Jan 2014 03:35:38 +0000 (19:35 -0800)]
build: rename aarch64 target to arm64
Rename aarch64 build targets to arm64. The gcc toolchain is still
aarch64.
Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
David Turner [Fri, 24 Jan 2014 05:51:22 +0000 (05:51 +0000)]
am
82064659: am
327c3fef: am
fa2c68e8: am
51c47855: Merge "Vibra: compile and stage vibrator.default on all targets"
* commit '
82064659b8c56ad72f722d96733fe0b6f9ea0002':
Vibra: compile and stage vibrator.default on all targets
David Turner [Fri, 24 Jan 2014 05:51:21 +0000 (05:51 +0000)]
am
2ae1c269: am
146cce0e: am
cdecaca3: am
dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
* commit '
2ae1c269a7984c72932e1797faad58587967ecdf':
Vibra: emulator: compile and stage vibrator.goldfish
David Turner [Fri, 24 Jan 2014 05:47:17 +0000 (05:47 +0000)]
am
327c3fef: am
fa2c68e8: am
51c47855: Merge "Vibra: compile and stage vibrator.default on all targets"
* commit '
327c3fef766052c4e8d492d2102a39deb3bdcaa4':
Vibra: compile and stage vibrator.default on all targets
David Turner [Fri, 24 Jan 2014 05:47:17 +0000 (05:47 +0000)]
am
146cce0e: am
cdecaca3: am
dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
* commit '
146cce0ebccd5381dad9394dad350f968652c23a':
Vibra: emulator: compile and stage vibrator.goldfish
David Turner [Fri, 24 Jan 2014 05:44:04 +0000 (05:44 +0000)]
am
fa2c68e8: am
51c47855: Merge "Vibra: compile and stage vibrator.default on all targets"
* commit '
fa2c68e81a356556298f7bab21a29c14f99f3051':
Vibra: compile and stage vibrator.default on all targets
David Turner [Fri, 24 Jan 2014 05:44:03 +0000 (05:44 +0000)]
am
cdecaca3: am
dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
* commit '
cdecaca3017e902002627e68d40d09f00224baf8':
Vibra: emulator: compile and stage vibrator.goldfish
David Turner [Fri, 24 Jan 2014 05:36:34 +0000 (21:36 -0800)]
am
51c47855: Merge "Vibra: compile and stage vibrator.default on all targets"
* commit '
51c47855f01223b88e1eb134504782695867301f':
Vibra: compile and stage vibrator.default on all targets
David Turner [Fri, 24 Jan 2014 05:36:33 +0000 (21:36 -0800)]
am
dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
* commit '
dfc140cd3f31b4f02c807cc1aa6e85d8db87a324':
Vibra: emulator: compile and stage vibrator.goldfish
David Turner [Fri, 24 Jan 2014 05:33:08 +0000 (05:33 +0000)]
Merge "Vibra: compile and stage vibrator.default on all targets"
David Turner [Fri, 24 Jan 2014 05:32:54 +0000 (05:32 +0000)]
Merge "Vibra: emulator: compile and stage vibrator.goldfish"
Dirk Dougherty [Fri, 24 Jan 2014 03:14:19 +0000 (03:14 +0000)]
Merge "Add preliminary support for dynamic content js and css."
Dirk Dougherty [Fri, 24 Jan 2014 03:10:05 +0000 (19:10 -0800)]
Add preliminary support for dynamic content js and css.
Change-Id: I1dbc92356e8d4beb712b8872e9b6cf873bdb70be
Ying Wang [Thu, 23 Jan 2014 23:09:04 +0000 (15:09 -0800)]
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