Commit graph

3387 commits

Author SHA1 Message Date
Nick Pelly
b4977f5980 am e07a9d4a: Always install libnfc_ndef.
Merge commit 'e07a9d4aa4afd27461877fbfd4b132a5c6c34954' into gingerbread-plus-aosp

* commit 'e07a9d4aa4afd27461877fbfd4b132a5c6c34954':
  Always install libnfc_ndef.
2010-10-15 18:21:29 -07:00
Scott Main
c0aa1e1b30 Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread 2010-10-15 11:20:26 -07:00
Scott Main
5466af5017 remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
Change-Id: Ic8a7bec4f9a0aa81b8ab18d340281ad0d7e7c053
2010-10-15 11:18:58 -07:00
Nick Pelly
e07a9d4aa4 Always install libnfc_ndef.
libnfc_ndef is the (very small) library to implement NDEF message parsing.

Change-Id: Iab39a0904e1be2eb1fb07ef9f5cef5095c8a5b7b

Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-15 02:16:40 -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
Xavier Ducrohet
bf4643e2df am 1aff79ad: Add SystemUI (notification bar) to SDK build.
Merge commit '1aff79ad44bc4fd6aa5ec2d0922afe5a6bcf455d' into gingerbread-plus-aosp

* commit '1aff79ad44bc4fd6aa5ec2d0922afe5a6bcf455d':
  Add SystemUI (notification bar) to SDK build.
2010-10-13 22:53:45 -07:00
Xavier Ducrohet
1aff79ad44 Add SystemUI (notification bar) to SDK build.
Change-Id: I3f7001bfcf4ce61a523f7b24f61117225362b5a0
2010-10-13 17:26:29 -07:00
Bill Napier
00b31bee97 am fcab8402: Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
Merge commit 'fcab84025edd6ff0a7b1f380b75b99297e0b7c31' into gingerbread-plus-aosp

* commit 'fcab84025edd6ff0a7b1f380b75b99297e0b7c31':
  Add in MonkeyRunner target (and dependent libs) to SDK build.
2010-10-11 15:30:09 -07:00
Bill Napier
fcab84025e Merge "Add in MonkeyRunner target (and dependent libs) to SDK build." 2010-10-11 15:18:04 -07:00
Xavier Ducrohet
a0eb715ab0 am 747bc08a: Merge "Add all languages to the SDK image." into gingerbread
Merge commit '747bc08a8e78c47395bcc72811bb3e81fb7e557b' into gingerbread-plus-aosp

* commit '747bc08a8e78c47395bcc72811bb3e81fb7e557b':
  Add all languages to the SDK image.
2010-10-10 14:37:00 -07:00
Xavier Ducrohet
747bc08a8e Merge "Add all languages to the SDK image." into gingerbread 2010-10-10 14:31:10 -07:00
Xavier Ducrohet
8d3559ee91 Add all languages to the SDK image.
Change-Id: I5d715fdc7f802a55786fff73863bbbc108c780d4
2010-10-10 14:14:49 -07:00
Bill Napier
0e9473acfb Add in MonkeyRunner target (and dependent libs) to SDK build.
Change-Id: I396635324cf9d2e590513228f5de5cea9df4dfd3
2010-10-10 12:06:57 -07:00
Bill Napier
04345cb114 Add in MonkeyRunner target (and dependent libs) to SDK build.
Change-Id: I6aa0b1e48dfd0017b3c68fb3b25c02b703ecbd53
2010-10-08 17:37:29 -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
Jean-Baptiste Queru
547b902e99 am d29f5df3: Merge "Add TTS language files to the full build." into gingerbread
Merge commit 'd29f5df3663acb01f88347b67056d969e2d49d15' into gingerbread-plus-aosp

* commit 'd29f5df3663acb01f88347b67056d969e2d49d15':
  Add TTS language files to the full build.
2010-10-07 15:48:02 -07:00
Jean-Baptiste Queru
424de1779d resolved conflicts for merge of 0f085e5a to gingerbread-plus-aosp
Change-Id: If89721a5ee86b9ce27a2235ecd75f3eceec7def7
2010-10-07 15:00:12 -07:00
Brian Muramatsu
cd7170d7ee resolved conflicts for merge of 0f8fcbe2 to gingerbread
Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019
2010-10-07 14:31:21 -07:00
Jean-Baptiste Queru
d29f5df366 Merge "Add TTS language files to the full build." into gingerbread 2010-10-07 14:26:31 -07:00
Jean-Baptiste Queru
0f085e5a85 Merge "Explicitly request ip-up-vpn" 2010-10-07 14:16:35 -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
Brian Muramatsu
0f8fcbe271 Merge CTS-related change
Change-Id: I622b2647f075a8cefe82f0373e2f37b6ca7e6e4b
2010-10-07 13:44:47 -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
Jean-Baptiste Queru
0b44f50d5f Add TTS language files to the full build.
Bug: 3065214
Change-Id: I5c324965e693fe26d686b92d869e33facc92c762
2010-10-06 08:05:44 -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
Ying Wang
222a835d28 am 476d70ae: Clean step for CL 71822
Merge commit '476d70aece4395dc29288c3d647c64732d3a6d3d' into gingerbread-plus-aosp

* commit '476d70aece4395dc29288c3d647c64732d3a6d3d':
  Clean step for CL 71822
2010-10-05 18:12:51 -07:00
Ying Wang
476d70aece Clean step for CL 71822
Change-Id: Iddbefa915cdde0cc403134711b6ffd056c402db2
2010-10-05 18:07:29 -07: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
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
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
Brian Carlstrom
bdb2e9f3c2 am 46fc2341: Merge "Allow \'export WITH_HOST_DALVIK=false\' to override Makefile defaulting" into gingerbread
Merge commit '46fc2341c535ba624fd2dceec9399ce681a80866' into gingerbread-plus-aosp

* commit '46fc2341c535ba624fd2dceec9399ce681a80866':
  Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
2010-09-30 15:02:49 -07:00
Brian Carlstrom
46fc2341c5 Merge "Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting" into gingerbread 2010-09-30 15:00:31 -07:00
Brian Carlstrom
e947865041 Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
Change-Id: I8915bc1c9f52a3b6ab1a82b404ab61cd0726198d
2010-09-30 14:41:54 -07:00
Xavier Ducrohet
b68b6b558b am f51f24a6: Use the new sdk/build/tools.atree.
Merge commit 'f51f24a6ea5d972dcaf60f882c26a0a08c9014fc' into gingerbread-plus-aosp

* commit 'f51f24a6ea5d972dcaf60f882c26a0a08c9014fc':
  Use the new sdk/build/tools.atree.
2010-09-30 13:20:04 -07:00
Xavier Ducrohet
f51f24a6ea Use the new sdk/build/tools.atree.
As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.

Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.

Change-Id: I9158501cd68783d593e49e5fdea7f17d19b0120f
2010-09-30 11:52:12 -07:00
Ying Wang
3c3bf6773a am 0b9382c7: Separate out Proguard flag files to fix dependency.
Merge commit '0b9382c792c303a93f5805adf4eba377dac01950' into gingerbread-plus-aosp

* commit '0b9382c792c303a93f5805adf4eba377dac01950':
  Separate out Proguard flag files to fix dependency.
2010-09-30 09:31:38 -07:00
Xavier Ducrohet
cbbab0d57d am ffd5087e: Use the new sdk/build/tools.atree.
Merge commit 'ffd5087ec81a281b1299048b4282dad593ccd703' into gingerbread-plus-aosp

* commit 'ffd5087ec81a281b1299048b4282dad593ccd703':
  Use the new sdk/build/tools.atree.
2010-09-30 08:52:16 -07:00
Ying Wang
0b9382c792 Separate out Proguard flag files to fix dependency.
Bug: 3048005
Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11
2010-09-29 16:08:17 -07:00
Dan Bornstein
a38198a5f4 am c8c09e28: Inform dex-preopt when the target device is a uniprocessor.
Merge commit 'c8c09e285d59f73334267deb9502c0927c616837' into gingerbread-plus-aosp

* commit 'c8c09e285d59f73334267deb9502c0927c616837':
  Inform dex-preopt when the target device is a uniprocessor.
2010-09-29 12:53:24 -07:00
Dan Bornstein
c8c09e285d Inform dex-preopt when the target device is a uniprocessor.
By default, dex-preopt optimizes for an SMP target.

Change-Id: Ib92552e55f5426b9b035ce862233752af090bb43
2010-09-29 11:54:15 -07:00
Brian Carlstrom
73143d9dfc am ea83daa3: Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread
Merge commit 'ea83daa389aea493294617232b5c34414861d701' into gingerbread-plus-aosp

* commit 'ea83daa389aea493294617232b5c34414861d701':
  Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
2010-09-28 17:50:49 -07:00
Brian Carlstrom
ea83daa389 Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread 2010-09-28 17:45:59 -07:00
Ying Wang
e52fddec86 am 879779a5: Merge "framework-res is not used as regular Java library now." into gingerbread
Merge commit '879779a5806d6e09d1c852a93dd4e1793bbd96cd' into gingerbread-plus-aosp

* commit '879779a5806d6e09d1c852a93dd4e1793bbd96cd':
  framework-res is not used as regular Java library now.
2010-09-28 17:36:46 -07:00