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

1391 commits

Author SHA1 Message Date
Jean-Baptiste Queru
1607ba1c87 am 554eeb6c: am 493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures" 
* commit '554eeb6c7426c8c1df551516cff903d69ae94f26':
  Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
 2010-11-19 16:56:26 -08:00
Jean-Baptiste Queru
6c7b6fb3d2 resolved conflicts for merge of b2028868 to gingerbread-plus-aosp 
Change-Id: Ibe616c0bdf8e36aaee42279292a2dbe03c5643c2
 2010-11-19 12:35:33 -08:00
Jean-Baptiste Queru
b20288680e Merge "IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings" 2010-11-19 11:15:56 -08:00
Bruce Beare
ccec9c45d9 IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings 
Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2010-11-19 11:15:40 -08:00
Jean-Baptiste Queru
554eeb6c74 am 493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures" 
* commit '493306f7c318d632186bebd732708d4299e66a62':
  Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
 2010-11-19 11:15:19 -08:00
Jean-Baptiste Queru
493306f7c3 Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures" 2010-11-19 11:01:22 -08:00
Bruce Beare
885b6b99d3 Correct makefile test for stagefright build 
Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2010-11-19 10:45:11 -08:00
Jean-Baptiste Queru
1804025f53 am f41934fc: am 26d8c589: Merge "Display the TARGET_ARCH_VARIANT" 
* commit 'f41934fcd42c56a02742014e8e24520a85166117':
  Display the TARGET_ARCH_VARIANT
 2010-11-19 10:38:49 -08:00
Jean-Baptiste Queru
f41934fcd4 am 26d8c589: Merge "Display the TARGET_ARCH_VARIANT" 
* commit '26d8c5896e937ed677007c23d46d6759845fe91f':
  Display the TARGET_ARCH_VARIANT
 2010-11-19 10:37:07 -08:00
Jean-Baptiste Queru
26d8c5896e Merge "Display the TARGET_ARCH_VARIANT" 2010-11-19 10:29:14 -08:00
Ying Wang
cc6c8cb856 am 92cc4c07: am b26a65b5: Merge "Restrict make version to 3.81" 
* commit '92cc4c07475bd77ffb058f430c27b04f8cc9dfef':
  Restrict make version to 3.81
 2010-11-19 10:27:47 -08:00
Ying Wang
92cc4c0747 am b26a65b5: Merge "Restrict make version to 3.81" 
* commit 'b26a65b59ff5ed777accaf34ac06ab6a86dc37c6':
  Restrict make version to 3.81
 2010-11-19 10:24:57 -08:00
Jeff Brown
0c3909aacd Merge "Revert change removing AVRCP.kl and cpcap-key.kl" 2010-11-18 14:32:19 -08:00
Jeff Brown
b96e34066a Revert change removing AVRCP.kl and cpcap-key.kl 
Cannot remove these legacy prebuilts yet because they are
referenced in the SDK.

Change-Id: I87b6d1145932edc9335b9a800672e7f653ce5521
 2010-11-18 14:29:59 -08:00
Kenny Root
824d7b2f02 Fix typo in ALL_PREBUILT error message 
Change-Id: Ib59047e5c63950c84a6518a91ab6e5060c46ff21
 2010-11-18 14:27:00 -08:00
Jeff Brown
fbc4018d63 Merge "Use prebuilt keymaps in frameworks/base/data/keyboards." 2010-11-18 14:20:53 -08:00
Ying Wang
4f9269ef75 Restrict make version to 3.81 
Bug: 3209290
It turns out that gmake 3.82 on Mac OSX crashes with segmentation fault
at some point.

Change-Id: I7b632abe1cafc5f0ff2ea45611d8ccf0aa3f976a
 2010-11-18 11:18:52 -08:00
Jeff Brown
99aacc211e Use prebuilt keymaps in frameworks/base/data/keyboards. 
Change-Id: I847167abaf5538a45f40df0ed5d69c9848284871
 2010-11-18 00:08:24 -08:00
Ying Wang
c5a07ce038 Pass extfs sparse image flag to the release tool. 
Change-Id: Icb2a1c4fddb2b6153298ba1b849016aa3d792773
 2010-11-17 17:45:36 -08:00
Ying Wang
7ca5c91389 Merge "Product-configurable sparse ext images." 2010-11-17 16:07:40 -08:00
Ying Wang
542903a27b Product-configurable sparse ext images. 
Change-Id: Ifd0ac14d7df331c9f6f1e3eee0722e07b4ab199a
 2010-11-17 16:01:31 -08:00
Jean-Baptiste Queru
75220495d0 am 766a2a21: am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build." 
* commit '766a2a2125d41e8bfb88112601a34af08f47f7f1':
  Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
 2010-11-17 15:52:09 -08:00
Jean-Baptiste Queru
766a2a2125 am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build." 
* commit '48ec6d6f814a70068c4632b468cd7872f34295ad':
  Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
 2010-11-17 15:27:13 -08:00
Johnnie Birch
a4716b2618 Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build. 
Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e
 2010-11-17 15:15:08 -08:00
Ficus Kirkpatrick
16e2f98395 Fix a spelling error. 
Change-Id: If89847fa16db4e2b30372678ab8f7117ad5fa0c6
 2010-11-12 17:38:20 -08:00
Xavier Ducrohet
8d458ab320 am f5f81fc7: am 01a9840b: Merge "Rename layoutlib_utils into ide_common" 
* commit 'f5f81fc75e6f4ab598fab8876efc892243287def':
  Rename layoutlib_utils into ide_common
 2010-11-11 15:01:52 -08:00
Xavier Ducrohet
f5f81fc75e am 01a9840b: Merge "Rename layoutlib_utils into ide_common" 
* commit '01a9840ba7545d9175575cc3d95b2584b2dee31c':
  Rename layoutlib_utils into ide_common
 2010-11-11 14:59:57 -08:00
Xavier Ducrohet
2e5ee27e9e Rename layoutlib_utils into ide_common 
Change-Id: Iaa8275881dd1ee7d41c30f8b0d481253a6635271
 2010-11-11 12:44:16 -08:00
Patrick Scott
e39dd6b048 Merge "Replace grep | head | awk | tr | tr with awk." 2010-11-10 04:52:42 -08:00
Joe Onorato
25939e224e Set ro.build.characteristics to the value from PRODUCT_CHARACTERISTICS that's also passed to aapt. 
Bug: 3144768
Change-Id: Ic1724c64d015de7a5c4f13709b91db51b8f10872
 2010-11-09 08:53:01 -08:00
Patrick Scott
fa30f5b8c4 Replace grep | head | awk | tr | tr with awk. 
Head was causing a SIGPIPE in grep that only appeared when using
distss.  This wasn't causing any build problems but spewed a lot
of warnings.

However, this change trims the command from 5 proccesses to 1 which is
nice.

Change-Id: Iac846ec1d01a022976cfc5fd28091a720ab161e7
 2010-11-08 09:24:37 -05:00
Wink Saville
c2da70dbc5 Merge "Rename protoc to aprotoc." 2010-11-05 15:38:37 -07:00
Ying Wang
33c0d952fc Allow module-specific protoc flags. 
You can add local protoc flags via LOCAL_PROTOC_FLAGS.

Change-Id: If246a4edafe1edcec6a7f193bde8ce3c83de745b
 2010-11-05 11:30:58 -07:00
Wink Saville
e789083c06 Rename protoc to aprotoc. 
With gLucid protoc is installed in the base system, by renaming
our version there will be no confusion about which compiler is
being used.

Change-Id: Id6900baacc7d57abee5dc5f694b013d7a42b35c6
 2010-11-05 11:28:51 -07:00
Ying Wang
60293914c1 Set the correct proto intermediate dir for native modules. 
Change-Id: I008778de2b81ed0c029979a7865827a96bf44b51
 2010-11-05 11:20:03 -07:00
Ying Wang
3d6bf975bd Merge "Integrate protocol buffer compiler into the build system." 2010-11-05 17:33:41 +00:00
Ying Wang
5cf0b2cf83 Merge "'make dump-products' to dump products." 2010-11-04 13:21:20 -07:00
Jean-Baptiste Queru
9e5d44b796 am 57723b52: Merge 7b393fd1 from open-source master 
* commit '57723b52cdb446c751ba8e65fa060e7a4faf4907':
  Add version_defaults.mk to be a prerequisite of build.prop
 2010-11-04 10:57:36 -07:00
Jean-Baptiste Queru
57723b52cd Merge 7b393fd1 from open-source master 
Change-Id: I5fee3ccbf7845d087e72848b4cec0198cd4afc26
 2010-11-04 07:24:56 -07:00
Jean-Baptiste Queru
2042cabf71 am 6be29424: am 892ea1ea: Merge "build: Add spare size flag to mkyaffs2image" 
* commit '6be29424c60cb5e17ce0aacb026c1cb88a62428b':
  build: Add spare size flag to mkyaffs2image
 2010-11-03 10:59:25 -07:00
Chih-Wei Huang
75947ef5ef Add version_defaults.mk to be a prerequisite of build.prop 
The version_defaults.mk defines variables that may affect
the content of build.prop.

Change-Id: Iabb82459949bb6e7a91829c5b485aad331c50b72
 2010-11-03 18:33:46 +08:00
Ying Wang
cae4d12fd1 'make dump-products' to dump products. 
Change-Id: I6a1e7ce5d54f47898199bfc9d29245c2598f733c
 2010-11-02 23:04:24 -07:00
Ying Wang
462d26bd32 Only copy once even if the first matched src:dest pair appears more than once. 
Change-Id: I9bef6172a1123518e97e04190fb857f9ee2c7582
 2010-11-02 21:31:47 -07:00
Ying Wang
a5fc87a937 Integrate protocol buffer compiler into the build system. 
Bug: 3152546
Change-Id: Ida3ca3d633ce45704dc8e80d044cdbd3ca69aca5
 2010-11-02 19:25:47 -07:00
Jean-Baptiste Queru
6be29424c6 am 892ea1ea: Merge "build: Add spare size flag to mkyaffs2image" 
* commit '892ea1eaadfa5b57948bb66bd3432e06c58188e1':
  build: Add spare size flag to mkyaffs2image
 2010-11-02 14:17:54 -07:00
Naseer Ahmed
53871886bd build: Add spare size flag to mkyaffs2image 
Change-Id: Ib3a915ba5296d31f88cdc81e13da02f281dbdb9f
 2010-11-02 08:59:39 -07:00
Daniel Sandler
49b21018a6 Merge "make help: prints a handy list of useful targets" 2010-10-28 12:43:56 -07:00
Daniel Sandler
9566122c9d make help: prints a handy list of useful targets 
A small step to making the platform build environment more
self-documenting.

Change-Id: I8f6cebe6cbd4cf89736da23e9d0d2a257ea422ee
 2010-10-28 15:40:06 -04:00
Brett Chabot
3bab7f036c am 6e644e14: am ebf4b519: cherry pick \'CTS vm-tests depend on hostestlib\' into GB. 2010-10-27 18:58:46 -07:00
Brett Chabot
6e644e14cb am ebf4b519: cherry pick \'CTS vm-tests depend on hostestlib\' into GB. 2010-10-27 18:56:53 -07:00
Brett Chabot
ebf4b5190a cherry pick 'CTS vm-tests depend on hostestlib' into GB. 
Original description:
CTS vm-tests now depend on hosttestlib.

Bug 3125713

Conflicts:

	core/tasks/cts.mk

Change-Id: I9e364a9d9d2cae396691921424ca591beca05468
 2010-10-27 18:49:33 -07:00
Shih-wei Liao
c656030f7d Turn off llvm-rs-link to make launch time go faster. 
Change-Id: Idbbb5e24a269e3c9a1911b47b4fbb1616cef5803
 2010-10-23 03:07:13 -07:00
Jean-Baptiste Queru
6c75cb3752 am 0332f0ac: Truly default to the full config. 2010-10-22 12:12:52 -07:00
Jean-Baptiste Queru
0332f0ac1e Truly default to the full config. 
It is much better than generic for emulator-based work.

Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
 2010-10-22 10:03:49 -07:00
Ben Cheng
a1729fc593 Merge "Insert directives to work around a CPU bug." 2010-10-22 09:49:47 -07:00
Ben Cheng
efd2489b39 Insert directives to work around a CPU bug. 
Bug: 3117632
Change-Id: I2fb58e7093984d18d2d2d21edf687206f4ddab31
 2010-10-21 15:15:09 -07:00
Ying Wang
2923c45d39 am 4038bbc4: am 09a00a67: Don\'t build update zip package if there is no kernel, or it\'s generic device. 
Merge commit '4038bbc426776d8adc57d7c3c8123357b50b1615'

* commit '4038bbc426776d8adc57d7c3c8123357b50b1615':
  Don't build update zip package if there is no kernel, or it's generic device.
 2010-10-21 13:45:14 -07:00
Dianne Hackborn
894bf9c0a4 Merge "We are API 9 compatible." 2010-10-21 10:51:08 -07:00
Jean-Baptiste Queru
2ea6527e7b am 5a98ec04: resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aosp 
Merge commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d'

* commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d':
  Explicitly declare assembly only __ASSEMBLY__ macro for assembly source
 2010-10-21 09:53:57 -07:00
Dianne Hackborn
311c267e15 We are API 9 compatible. 
Change-Id: Ice1c07993fb66c12cafeaefa874a7adbb19caf21
 2010-10-20 18:54:17 -07:00
Ying Wang
4038bbc426 am 09a00a67: Don\'t build update zip package if there is no kernel, or it\'s generic device. 
Merge commit '09a00a672bb18dccc97af6090739ea275c39d8a3' into gingerbread-plus-aosp

* commit '09a00a672bb18dccc97af6090739ea275c39d8a3':
  Don't build update zip package if there is no kernel, or it's generic device.
 2010-10-20 14:28:52 -07:00
Ying Wang
09a00a672b Don't build update zip package if there is no kernel, or it's generic device. 
Move the update package code block forward to be side by side with the ota package code,
so that they are built under the same condition.
Bug: 3116070

Change-Id: I8055909cc614bfbeee215d1b770a80f728e326ee
 2010-10-20 14:12:21 -07:00
Jean-Baptiste Queru
5a98ec046c resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aosp 
Change-Id: I336f9e6859dce3bb18224b3340837474319c809c
 2010-10-19 15:19:45 -07:00
Dianne Hackborn
8cd3838371 Gingerbread becomes real. 
Change-Id: I20668ef8a9221b802d785e9c8ea1b6b882f828ac
 2010-10-18 11:46:50 -07:00
Ying Wang
9af2da0d94 Merge "Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only." 2010-10-15 10:05:02 -07:00
Bruce Beare
f1582e5499 Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures 
Change-Id: I5c1010d9caaa8d9ffaf65999fa3649c3c2be8caa
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2010-10-14 14:31:48 -07:00
Bruce Beare
8ee0dfdd43 Display the TARGET_ARCH_VARIANT 
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2010-10-14 12:26:31 -07:00
Jim Huang
20d1ba602b Explicitly declare assembly only __ASSEMBLY__ macro for assembly source 
To isolate the assembly-only macros in header files, such as
<machine/cpu-features.h>, this patch attempts to declare assembly
only __ASSEMBLY__ macro in build system.

Change-Id: I081c3e46258a9256b20995e4d0b473c64745444c
 2010-10-14 16:17:31 +08:00
Doug Zongker
98582b28e8 radio files aren't modules, prebuilt or otherwise 
Change-Id: Ic21cf9f7d9657819e40c6700c98e61971dab24b4
 2010-10-13 13:39:56 -07:00
Ying Wang
4a5bd245ff Fix typo. 
Change-Id: Iabdc6ec1ead4f37294f01ebebc1e71e188455533
 2010-10-11 16:36:02 -07:00
Ying Wang
7522f04a4b Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only. 
Bug: 3076955
Change-Id: I7ddcc5b9d6325d3a3c63f952f97034ddf223630a
 2010-10-11 16:33:37 -07:00
Ying Wang
16697b7000 Hook up the dependency. 
Now llvm-rs-link is directly called by the build system.

Change-Id: I281cc6fd9e21ee7d120ddea390f802b57c894fd6
 2010-10-11 13:44:50 -07:00
Shih-wei Liao
f7b32bfe41 Enable LLVM_RS_LINK. No longer forking an LLVM linker inside llvm-rs-cc. 
Change-Id: I2ebc6ec759daf36d1e77fa8e30147ab8e40b44fc
 2010-10-11 10:36:42 -07:00
Brian Muramatsu
0dd458e65a am 99185c2a: am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to gingerbread 
Merge commit '99185c2a462d563855e4bc0c1e5649a21b2e186b'

* commit '99185c2a462d563855e4bc0c1e5649a21b2e186b':
  Support Additional CTS Host Jars
 2010-10-10 12:51:28 -07:00
Shih-wei Liao
c8241ca100 Merge "Make naming consistent: llvm-rs-cc and llvm-rs-link." 2010-10-10 09:58:22 -07:00
Ying Wang
0ce72c458c am 3b008f36: am 83f69eb5: Prepend ccache to CC/CXX if necessary. 
Merge commit '3b008f36956c35f58d510ad3da5090cf21a08349'

* commit '3b008f36956c35f58d510ad3da5090cf21a08349':
  Prepend ccache to CC/CXX if necessary.
 2010-10-10 09:10:22 -07:00
Shih-wei Liao
d01fadb6bc Make naming consistent: llvm-rs-cc and llvm-rs-link. 
Change-Id: I8e8ae27548131b47fbbd037d55b472d095d7bb8f
 2010-10-08 17:55:26 -07:00
Joe Onorato
e814ad4950 am 5c41c178: am 700b88e1: Pass device characteristic information through to aapt. 
Merge commit '5c41c17868865d1f2e9e2ff4680b528da61d16af'

* commit '5c41c17868865d1f2e9e2ff4680b528da61d16af':
  Pass device characteristic information through to aapt.
 2010-10-08 14:36:43 -07:00
Joe Onorato
64cf5aa667 Revert "Enforce that PRODUCT_ variables aren't modified by module makefiles" 
This reverts commit 95e743a6c0.
 2010-10-08 17:01:50 -04:00
Ying Wang
24e1c018ba Integrate the slang "-MD" into the build system. 
So that the header dependency can be included.
Bug: 2932230

Change-Id: I4d69870049157206ce2ab637ec6d673467db0c64
 2010-10-08 09:37:44 -07:00
Ying Wang
a5a684c32b Merge ""Slang" no longer needs "--allow-rs-prefix" option. "Slang" now knows if a function is in a system header file. If so, the function can be prefixed by "rs". Otherwise, "rs" prefix is rightly disallowed. So, no more "allow-rs-prefix" hacking." 2010-10-08 09:36:57 -07:00
Jean-Baptiste Queru
c59777b35c ip-up-vpn doesn't need to be grandfathered any more 
Change-Id: I8fb7f98ec253f95d5eccb2603c4e09db19be2742
 2010-10-08 07:47:45 -07:00
Shih-wei Liao
c95899f46d "Slang" no longer needs "--allow-rs-prefix" option. "Slang" now knows if a function 
is in a system header file. If so, the function can be prefixed by "rs". Otherwise,
"rs" prefix is rightly disallowed. So, no more "allow-rs-prefix" hacking.

Change-Id: I8d5982cd6a75d465ffa6f98ca96941ae761117a2
 2010-10-08 07:14:03 -07:00
Jean-Baptiste Queru
95e743a6c0 Enforce that PRODUCT_ variables aren't modified by module makefiles 
This eliminates one of the way a module could insert itself into
a build without going through a product definition file.

Change-Id: I1d537764d73c52ceaec96b64b6b6925e2f6a8d8e
 2010-10-07 16:08:46 -07:00
Brian Muramatsu
99185c2a46 am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to gingerbread 
Merge commit 'cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959' into gingerbread-plus-aosp

* commit 'cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959':
  Support Additional CTS Host Jars
 2010-10-07 15:48:15 -07:00
Brian Muramatsu
cd7170d7ee resolved conflicts for merge of 0f8fcbe2 to gingerbread 
Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019
 2010-10-07 14:31:21 -07:00
Ying Wang
3b008f3695 am 83f69eb5: Prepend ccache to CC/CXX if necessary. 
Merge commit '83f69eb5f905d47581bed141b7f5103362390339' into gingerbread-plus-aosp

* commit '83f69eb5f905d47581bed141b7f5103362390339':
  Prepend ccache to CC/CXX if necessary.
 2010-10-07 13:57:29 -07:00
Dima Zavin
21773134b4 am 4477db78: CHERRY-PICK: propogate module tags for prebuilts 
Merge commit '4477db7883dfa21aa423f29057511fdb804c46af' into gingerbread-plus-aosp

* commit '4477db7883dfa21aa423f29057511fdb804c46af':
  CHERRY-PICK: propogate module tags for prebuilts
 2010-10-07 13:57:24 -07:00
Ying Wang
83f69eb5f9 Prepend ccache to CC/CXX if necessary. 
In case TARGET_CC is assigned with HOST_CC (eg, simulator build),
ccache will be prepended twice before this CL.
Bug: 3069576

Change-Id: I2ee44faea3a2795cf389ad6f80e4066a02b43be9
 2010-10-07 10:45:02 -07:00
Dima Zavin
4477db7883 CHERRY-PICK: propogate module tags for prebuilts 
Change-Id: I08f1ae2ae4bb47a393cf5de1ed616d76fcd961c9
Signed-off-by: Dima Zavin <dima@android.com>
 2010-10-07 09:44:50 -07:00
Joe Onorato
5c41c17868 am 700b88e1: Pass device characteristic information through to aapt. 
Merge commit '700b88e1451f216d137d8a356496bf51712512c6' into gingerbread-plus-aosp

* commit '700b88e1451f216d137d8a356496bf51712512c6':
  Pass device characteristic information through to aapt.
 2010-10-07 07:09:25 -07:00
Stephen Hines
3be1cf92ad Remove libclang* from user_tags.mk. 
Change-Id: I428908bc6142b4c4c2e20bf7dbb86e61ff84734f
 2010-10-06 14:14:12 -07:00
Joe Onorato
700b88e145 Pass device characteristic information through to aapt. 
A build configuration can define PRODUCT_CHARACTERISTICS, which is
a comma-separated list of device characteristics, for example
"nosdcard,grayscale".  This will be passed through to aapt with
the --product flag.

Change-Id: I902c034b2f2824dbd2d33449308ee08beeb09551
 2010-10-06 10:44:33 -04:00
Brian Muramatsu
45a971d961 Support Additional CTS Host Jars 
Include another optional Makefile from the CTS project that
specifies additional JARs that the CTS host may need. This
will make it easier to create modules in the CTS project
that can be built for the host and device and shared between
the host and test cases.

The first such library will include annotations like
"RequiresFeature" and "SupportsProfile" that will be needed
to support multiple device profiles in CTS.

Another planned libraries could include defining the CTS
version number in a central spot and sharing code used to
probe for certain properties like the OpenGL version and
other system properties.

Can be checked in after this other change without causing
breakage: https://review.source.android.com/#change,16740

Change-Id: I3c488247b66522dc86277ab43198c34f790e0618
 2010-10-05 13:44:33 -07:00
Ying Wang
25a04dadf6 am b7019e21: am a9c381ed: Any intermediate targets between Progaurd and the built_dex should be differently named. 
Merge commit 'b7019e2147173a962febeab0e0693cdec9f80789'

* commit 'b7019e2147173a962febeab0e0693cdec9f80789':
  Any intermediate targets between Progaurd and the built_dex should be differently named.
 2010-10-02 20:10:59 -07:00
Ying Wang
b7019e2147 am a9c381ed: Any intermediate targets between Progaurd and the built_dex should be differently named. 
Merge commit 'a9c381ed4517993175a5bb6741ecf2aac3e8040c' into gingerbread-plus-aosp

* commit 'a9c381ed4517993175a5bb6741ecf2aac3e8040c':
  Any intermediate targets between Progaurd and the built_dex should be differently named.
 2010-10-02 20:08:55 -07:00
Ying Wang
a9c381ed45 Any intermediate targets between Progaurd and the built_dex should be differently named. 
Change-Id: Ifb01b1fcf24ba0c5b98aa02dd604cd81918e1841

To do that, we have to move classes.jar step before proguard, so classes.jar is always with the full names.
 2010-10-02 19:41:10 -07:00
Ying Wang
1406613b63 am bf2ed191: am a83940fa: Move odex related files to product-specific dir. 
Merge commit 'bf2ed191fe229b6a83684c19a57e11e7b50c8637'

* commit 'bf2ed191fe229b6a83684c19a57e11e7b50c8637':
  Move odex related files to product-specific dir.
 2010-10-01 17:07:29 -07:00
Ying Wang
bf2ed191fe am a83940fa: Move odex related files to product-specific dir. 
Merge commit 'a83940fa7851b35712e559be2246b56b5666b805' into gingerbread-plus-aosp

* commit 'a83940fa7851b35712e559be2246b56b5666b805':
  Move odex related files to product-specific dir.
 2010-10-01 15:51:35 -07:00
Ying Wang
a83940fa78 Move odex related files to product-specific dir. 
For target Java libraries, now the LOCAL_BUILT_MODULE includes both javalib.jar
and the .odex file, if dexpreopt is enabled.
These 2 files are moved to a product-specific dir in this change.
For target Java Libraries, $(intermediates) now points to the product-specific dir.
There is still a javalib.jar in the $(intermediates.COMMON) dir, which is used as dependency.
Nothing is changed for host Java libraries.

Change-Id: I2546dbb940c74537864ca002d1acb49bb731fbbc
 2010-10-01 14:41:43 -07:00