Commit Graph

2766 Commits

Author SHA1 Message Date
Scott Main
fa83b5e4da Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread 2010-11-01 10:49:07 -07:00
Jean-Baptiste Queru
6a514dcc9d am 16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
* commit '16bf5290b1c8fcedda6c376db64f2bacbaf2c7a4':
  CTS vm-tests now depend on hosttestlib.
2010-10-29 05:51:54 -07:00
Jean-Baptiste Queru
16bf5290b1 Merge from AOSP froyo. Do not merge.
CTS vm-tests now depend on hosttestlib.

Change-Id: Ie252227825ccb843b4be1205e3b135b7535b8a03
2010-10-29 05:49:08 -07:00
Scott Main
f086a6e434 docs: update sdk download template DO NOT MERGE
add windows installer and revise a bit else

Change-Id: Ie0ea7765d797cb54ee1d7fc733ec6db4fdedac3a
2010-10-28 00:21:25 -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
Jean-Baptiste Queru
ba8d47b764 Merge "CTS vm-tests now depend on hosttestlib." into froyo 2010-10-27 14:59:39 -07:00
Brett Chabot
bdb51d7c64 CTS vm-tests now depend on hosttestlib.
Bug 3125713

Change-Id: I5774df2abeff7dd82e1218138d1ea3b25edd0901
2010-10-26 18:55:56 -07:00
Scott Main
9d32bd5b03 docs: css tweak to Ps in sidebox. DO NOT MERGE.
Change-Id: Ifa3e4a9a2c2ba67b6da615ebc336c897dd9caeda
2010-10-25 17:15:12 -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
Dianne Hackborn
8cd3838371 Gingerbread becomes real.
Change-Id: I20668ef8a9221b802d785e9c8ea1b6b882f828ac
2010-10-18 11:46:50 -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
Xavier Ducrohet
1aff79ad44 Add SystemUI (notification bar) to SDK build.
Change-Id: I3f7001bfcf4ce61a523f7b24f61117225362b5a0
2010-10-13 17:26:29 -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
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
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
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
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
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
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
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
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
0b9382c792 Separate out Proguard flag files to fix dependency.
Bug: 3048005
Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11
2010-09-29 16:08:17 -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
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
879779a580 Merge "framework-res is not used as regular Java library now." into gingerbread 2010-09-28 17:32:36 -07:00
Ying Wang
912f828605 framework-res is not used as regular Java library now.
Change-Id: Ic2b8f7d7bceab3be7884eb4a7dbe721c14bd1ccb
2010-09-28 17:27:56 -07:00
Dianne Hackborn
2f85f654ee Merge "Add location shared library to core build." into gingerbread 2010-09-28 17:14:39 -07:00
Ying Wang
e192626048 Treat prebuilt SDKs and the stub as normal java libraries.
Change-Id: Ic5512b952d8218e63e40aeb07966de21391ef42d
2010-09-28 16:18:03 -07:00
Dianne Hackborn
588fab8bbc Add location shared library to core build.
Change-Id: I3ea62e2fb29611337044d4c3c10f756fb5d35f43
2010-09-28 14:25:05 -07:00
Brian Carlstrom
c634d2c19d Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
Change-Id: I3dfc1aa6f10a52c2adc68259ce1cedec2ffd8f0e
2010-09-28 13:44:39 -07:00
Ying Wang
bb2b82bd55 Merge "Fix userdata partition's ext4 mount point to data." into gingerbread 2010-09-27 18:03:52 -07:00
Ying Wang
026f1451ce Fix userdata partition's ext4 mount point to data.
Bug: 3041475
Change-Id: I07306cd9c90072626dfc132d6655618ae70e64be
2010-09-27 17:49:03 -07:00
Brett Chabot
ef5fd0e18f Merge "Package ddmlib-prebuilt with CTS." into gingerbread 2010-09-27 17:47:55 -07:00
Xavier Ducrohet
2daa77ee01 Package ddmlib-prebuilt with CTS.
This ensures that CTS is using a compatible ddmlib.
2010-09-27 17:28:39 -07:00
Jean-Baptiste Queru
6bc232a116 Merge "Don't reference CarHome and CarHomeLauncher" into gingerbread 2010-09-27 17:24:02 -07:00
Jean-Baptiste Queru
102b8f46a5 Don't reference CarHome and CarHomeLauncher
They're not actually part of AOSP

Change-Id: Iacb832173be7faa8ea22f74ca25e1fd68ef1dbdb
2010-09-27 17:04:41 -07:00
Ying Wang
1fdbf261a0 Don't set DISABLE_DEXPREOPT in lunch.
Because in core/main.mk WITH_DEXPREOPT is set to true only if the build OS is linux.

Change-Id: I287ab61312667f6100371d07010bcab5cfcc7e17
2010-09-27 16:25:11 -07:00
Ying Wang
30090e41e3 Set the intermediate dirs before using them.
Change-Id: Ibdab1234ca8c5a86c5226ed71e84374c3fcd7a90
2010-09-27 14:53:39 -07:00
Ying Wang
9049e321ae Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
So the its target-specific PRIVATE vars can be set properly.

Change-Id: I83b60bd56ee8523b0ba97092010c76c270b60c02
2010-09-27 14:07:17 -07:00
Ying Wang
0235237805 Remove emulator-based dexpreopt logic from the build system.
Change-Id: Ic96cbd1ebb9fa65aa85bf77f18a31913625d7e1c
2010-09-27 10:37:25 -07:00
Jean-Baptiste Queru
97984c41fe reconcile froyo-release into gingerbread
Change-Id: If6c3b341b0716ef4f80721da2635b7bde45f453d
2010-09-26 17:28:49 -07:00