Commit graph

125 commits

Author SHA1 Message Date
Ying Wang
a032d3d073 Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
Bug: 5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1
2011-11-11 10:52:12 -08:00
Brian Muramatsu
277be2fe0c Stop Packaging Old CTS Test Runner Files
Bug 5563917

This stops packaging the startcts script and the cts.jar into
the android-cts.zip. Since we are only testing using Tradefed,
we should prevent confusion by removing the old test runner.

Change-Id: I79f991617dd9e6a51a314207b4727cce3136d60f
2011-11-03 11:42:39 -07:00
David 'Digit' Turner
becc3da915 resolved conflicts for merge of 2f2882a0 to master
Change-Id: Ia07eb9d022a8036c2b1674c591514740aa0d4596
2011-09-23 11:44:29 +02:00
David 'Digit' Turner
2f2882a04e am fdb13fcc: am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit 'fdb13fccfecdf526549ad453a20e8136253edb51':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
2011-09-22 23:01:17 -07:00
Brian Muramatsu
164285e05f am 8658fa51: am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5
* commit '8658fa51d15290cf43178d0633b53f11ff08a4aa':
  Disable Dexpreopt for generic_arm5
2011-09-09 12:04:27 -07:00
Brian Muramatsu
8658fa51d1 am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5
* commit '9d014e6570deb3861b503833823e56e1c589626c':
  Disable Dexpreopt for generic_arm5
2011-09-08 10:26:29 -07:00
Brian Muramatsu
d47da70817 am 3eae5b7c: am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS Build
* commit '3eae5b7c1b3197bed4c883a671cfea9d5d9570bf':
  Use package.apk.unaligned in CTS Build
2011-09-08 10:08:27 -07:00
Brian Muramatsu
9353a3be5f Disable Dexpreopt for generic_arm5
Bug 5267392

After coming across another place where I would have to use
package.apk.unaligned, I decided maybe it is best to just
disable dexpreopt as was previously suggested.

Use package.apks in the CTS Makefile task.

Change-Id: Iec839a72f4b53441337523b8a9cccda657eec8e8
2011-09-07 18:12:22 -07:00
Brian Muramatsu
3eae5b7c1b am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS Build
* commit '08b8e0024812ea907cf3938bcd07b8dca6188eaf':
  Use package.apk.unaligned in CTS Build
2011-09-02 16:56:07 -07:00
Brian Muramatsu
2306106d3e Use package.apk.unaligned in CTS Build
Bug 5252989

This prevents dexopt installation failures when trying to
install CTS apks on production devices.

Change-Id: I1eeb0ac567c3be3b831c8c27dee4005ec00fd7cd
2011-09-02 15:29:10 -07:00
David 'Digit' Turner
041fb639bf sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
This patch fixes the broken builds for PRODUCT-google_sdk-sdk_addon
and PRODUCT-google_sdk_x86-sdk_addon.

Change-Id: Iba0f23a03c143cd38aaba98b0bd0d52686330ed6
2011-08-31 00:43:07 +02:00
Tsu Chiang Chuang
44802a22e3 fix mixing argument in makefile.
Change-Id: I659d996dda0a2047ebb3240607e66411fc60fda6
2011-07-13 16:40:33 -07:00
David 'Digit' Turner
d19750e87f am 36331f84: resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp
* commit '36331f8455822539fe4fbb0a25fbc377bbc80a89': (23 commits)
  sdk-addon.mk: Copy image files to ABI-specific dir
  emulator: Enable dex-preoptimization
  sdk: provide ABI-dependent atree files
  emulator: Build emulator platform images as ARMv7-A
  x86: Add proper gcc-4.4.3 x86 toolchain support.
  sdk: Add pc-bios files for IA qemu emulator
  x86: qemu emulator is the default build target
  Add full_x86 product.
  x86: sdk_x86 build target
  Minor cleanup - DO NOT MERGE
  Clean up full config - DO NOT MERGE
  Make a full list of locales available
  Truly default to the full config.
  generic_x86 builds don't need/use the sparse ext4 format.
  Use ext4 file system for generic_x86 userdata partition
  GB Updates for init.rc and boot command line
  Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
  Display the TARGET_ARCH_VARIANT
  Add generic_x86-eng to the lunch menu
  Move buildspec vars to BoardConfig.mk
  ...
2011-07-11 11:55:35 -07:00
David 'Digit' Turner
9fb131a9b6 sdk-addon.mk: Copy image files to ABI-specific dir
Change-Id: I39ad022a5bb03ea39fc41c134d1d4855dc491deb
2011-07-08 01:56:51 +02:00
Brian Carlstrom
af85000e7a Breakup android.core.tests.libcore based on top level package name
git cherry-pick --no-commit ec122eb2c11dfb8553d3707208a1ecbe7366f61b

Change-Id: I685ece362674f83f179ace34367fce88a7f541fb
2011-05-27 00:04:57 -07:00
Tsu Chiang Chuang
77440f3c37 adding TF dependency to vm-tf, since now we are using cts-tf things.
Change-Id: Ia7538dc204faa93f47cd3fd104ed05c9da3e8741
2011-05-16 14:08:12 -07:00
Tsu Chiang Chuang
9d047acbcc adding a new package to run vm tests in cts-tf
Change-Id: I523860b4e73b11cc158706a30e6694d9188a6697
2011-04-27 19:50:25 -07:00
Joe Onorato
2a6e052ed0 update to use the new apicheck
Change-Id: I47dfe29957a9a65dddae973640ff9029418ffdc5
2011-04-08 17:32:52 -07:00
Joe Onorato
15ee93bf95 Current.xml and friends are now .txt instead.
(and much much easier to read)

Change-Id: I31832069d4fd78a937802aa20d0b0861bf99768c
2011-04-08 15:03:48 -07:00
Brian Carlstrom
bb7c6d88c6 Tracking merge of dalvik-dev to master
git cherry-pick --no-commit  5fac8d8f7096d8a950acad1ad0a8b963cef72e03

git cherry-pick --no-commit  1a8210710b46a0796ff2f8e76b6beb3a54f89019

git cherry-pick --no-commit  4fe2ac9f7284b838393aec8f0f48caef2510fd46

git cherry-pick --no-commit  7beb710a8f976fc4cb1e8be780644386870c4975

Change-Id: Ib10348e5509c906c6b95fa4accd6a18900bfe748
2011-04-01 15:45:58 -07:00
Ying Wang
a9be570b5d resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp
Change-Id: Idddf7afb063109654664ecac252cf6be73125c20
2011-03-31 18:05:37 -07:00
Ying Wang
fdc3192e68 resolved conflicts for merge of bd0c91c8 to gingerbread-plus-aosp
Change-Id: Ia4d8719337f84927f96a162b97df8a8bc62630e1
2011-03-31 17:00:13 -07:00
Raphael
9b4660a1c6 resolved conflicts for merge of db0d59d1 to honeycomb-plus-aosp
Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30
2011-03-25 15:13:55 -07:00
Raphael
bd0c91c8b9 Merge c4d4731b4d: 'Build SDK repository'. Do not merge.
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I863ac8baf159432d7c95df46cba6e4f3b9122629
2011-03-24 13:41:35 -07:00
Bruce Beare
18a130e98a x86: qemu emulator is the default build target
Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-03-15 07:47:48 -07:00
Raphael
3e54830dc8 Fix for SDK repository.
Change-Id: Ia1245226c451ed4539a0a0cd51022a3325f4b33b
2011-02-23 22:34:16 -08:00
Raphael
336cd7dcb0 Merge "Build SDK repository" 2011-02-22 14:36:00 -08:00
Brett Chabot
a29d7e4b17 Merge "Build cts-tradefed README into cts.zip" into honeycomb 2011-02-18 15:45:01 -08:00
Brett Chabot
e847a39956 Build cts-tradefed README into cts.zip
Change-Id: Idd2d36a021eb706846673a1ebc417a1f4c3b9d38
2011-02-18 15:13:50 -08:00
Raphael
c4d4731b4d Build SDK repository
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: Ie7e0f789bafd73d5ee2461349155a6e562e2edd9
2011-02-16 20:27:59 -08:00
Raphael
843c6e2530 merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
Depends on change 8252cdea from development to get the
verbose/quiet flag for mkstub.

Change-Id: I1ac97023570a4fc8a0b9dd50db429c55184ec88c
2011-02-04 12:34:54 -08:00
Raphael
30e0707531 SDK: stub the maps.jar from the google_apis addon.
Depends on change 8252cdea from development to get the
verbose/quiet flag for mkstub.

Change-Id: I5f4e766613576828147c97be8d38e97fe1035672
2011-02-03 23:00:49 -08:00
Brett Chabot
2aad7a5bea Merge "Add cts-tradefed to cts build." into honeycomb 2011-01-31 13:42:11 -08:00
Brett Chabot
358b24700b Add cts-tradefed to cts build.
Bug 3403768

Change-Id: I0ca2068f93f25b2f5f6691c5ce70573da4a12aa6
2011-01-31 12:57:56 -08:00
Jean-Baptiste Queru
e0d4dbad5a am a4781e86: Merge from open-source gingerbread
* commit 'a4781e867f2e9115ce5b8085576bebf6505bfd00':
  CTS: pass vogar expectation location to CollectAllTests.
2011-01-29 09:27:39 -08:00
Brett Chabot
fdb400cf20 CTS: pass vogar expectation location to CollectAllTests.
Bug 3181338

Change-Id: I740ab73bee39975ad859b5e11b987ca74fd42658
2011-01-07 16:19:02 -08:00
Brian Muramatsu
1cf9e0ef16 Change from @ to $(hide) in CTS Build
Change-Id: Ibda485105f750e971260088785904ea420cbaa03
2010-12-06 12:49:13 -08: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
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
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
Brian Muramatsu
cd7170d7ee resolved conflicts for merge of 0f8fcbe2 to gingerbread
Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019
2010-10-07 14:31:21 -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
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
Ben Dodson
70748bb17f Fix for heap size in apicheck
Change-Id: Id2efffef3e81464994c3788d1d0bc69c60bc6456
2010-08-11 14:08:28 -07:00
Ben Dodson
83019ba39c Use doclava for apicheck
Change-Id: I6a84717cf645e2a27cea9271c444d159c82439c5
2010-08-10 16:01:36 -07:00
Brian Carlstrom
7dc35a3b9c Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd3
git cherry-pick --no-commit d05d74b2d6
git cherry-pick --no-commit 5479d77e32

Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
2010-08-04 23:17:47 -07:00
Xavier Ducrohet
c350a66807 am 45270759: am e743c53b: Package ddmlib-prebuilt with CTS.
Merge commit '45270759642c03bdbe39ae261e22160d2c64ecec'

* commit '45270759642c03bdbe39ae261e22160d2c64ecec':
  Package ddmlib-prebuilt with CTS.
2010-07-28 15:17:09 -07:00
Xavier Ducrohet
4527075964 am e743c53b: Package ddmlib-prebuilt with CTS.
Merge commit 'e743c53b88faf35be47667b0252c881c7b32f856' into gingerbread-plus-aosp

* commit 'e743c53b88faf35be47667b0252c881c7b32f856':
  Package ddmlib-prebuilt with CTS.
2010-07-28 15:14:51 -07:00
Xavier Ducrohet
e743c53b88 Package ddmlib-prebuilt with CTS.
This ensures that CTS is using a compatible ddmlib.

Change-Id: Iff6d2bfec873949dfd07ccf758bf257350f11298
2010-07-28 11:07:31 -07:00
The Android Open Source Project
83ef704944 am 4e8e998e: am 989fade3: am af44485f: merge from open-source froyo
Merge commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4'

* commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4':
  Include Test Case List from CTS Project
2010-07-26 12:31:21 -07:00