Commit Graph

78 Commits

Author SHA1 Message Date
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
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
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
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
Brett Chabot
fdb400cf20 CTS: pass vogar expectation location to CollectAllTests.
Bug 3181338

Change-Id: I740ab73bee39975ad859b5e11b987ca74fd42658
2011-01-07 16:19:02 -08: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
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
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
The Android Open Source Project
989fade304 am af44485f: merge from open-source froyo
Merge commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10' into gingerbread

* commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10':
  Include Test Case List from CTS Project
2010-07-26 12:06:35 -07:00
Brian Muramatsu
fa3d88f884 Include Test Case List from CTS Project
Bug 2732160

Have the cts.mk include the test case list from CTS rather
than defining it in cts.mk. This permits CTS developers to
add new packages and applications without having to submit
multiple project changes to both the CTS and build projects
everytime.

Change-Id: I63d90ac4f5d9fc9a9aa0ff79a8bf9dfb1a79c822
2010-07-22 14:46:53 -07:00
Jean-Baptiste Queru
07523a191d am a0cb4666: Merge "merge from open-source froyo" into froyo
Merge commit 'a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a' into gingerbread

* commit 'a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a':
  Build Accessibility Tests and APK
2010-07-14 11:29:08 -07:00
Brian Muramatsu
36b332beca Build Accessibility Tests and APK
Bug 2814482

Froyo's cts.mk was missing two lines added to Eclair's cts.mk that
are needed to build the accessibility tests and apk.

Change-Id: I05f93bc0a56b2ec1e07eab8c7a15ef7d4bb90d18
2010-07-08 13:05:09 -07:00
Ying Wang
66356cef22 am 7a794289: Merge "Unbundle the build system." into froyo
Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into kraken

* commit '7a7942899eedde3b946768a155fac3d70af5c9c3':
  Unbundle the build system.
2010-06-09 11:33:32 -07:00
Ying Wang
0f6f4ca54e Unbundle the build system.
Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0
2010-06-09 10:26:26 -07:00
Joe Onorato
8a06bac1db Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the
build.

Change-Id: I5a6066fa2afc9cb7bea794770bbb589615a1f9eb
2010-05-26 17:58:21 -04:00
Joe Onorato
77dc0a58e2 Add a rule that builds an eclipse project file for an app.
Type make ECLIPSE-<app1>-<app2>... with the apps as listed in LOCAL_PACKAGE_NAME.

Change-Id: Ieb96dfc9dfc13bdf1b3be53572092fc7bc695869
2010-05-17 18:20:42 -07:00
Brett Chabot
1e43c51075 Add CTS accounts tests to CTS makefile.
Change-Id: If7d87e2deed2036536ad852c382dca0e8bbad87b
2009-12-17 15:14:40 -08:00
Dan Bornstein
bb0c8804dd Add Bluetooth to the test list.
Change-Id: I1e18b76c87a7bba5ef3b4db8ac763bc7d9b6aac6
2009-11-20 13:13:41 -08:00
Dan Bornstein
01833fba3b Add the JNI test to the CTS list.
Change-Id: I60b2633b98ccb06551e521ff229ed12c897cc2e6
2009-11-18 17:27:10 -08:00
Brett Chabot
2779fa7d9f Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Bug 2099347

Change-Id: Ica876daca8993e8f6eefda6f1a733dcadc92f292
2009-11-18 14:40:54 -08:00
Dan Bornstein
1347f92e3a Add the example test to the CTS.
Change-Id: I392672f1767bf72a18058de49c8658dabdc93a4d
2009-11-17 14:27:40 -08:00
Brett Chabot
1b3886b848 am 45dc54f6: Add speech tests to CTS makefile.
Merge commit '45dc54f680faea12519870db356f84924c00687d' into eclair

* commit '45dc54f680faea12519870db356f84924c00687d':
  Add speech tests to CTS makefile.
2009-10-08 10:48:24 -07:00
Brett Chabot
af6ccb69fe am 30e1f2bd: Add dpi tests to CTS.
Merge commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408' into eclair

* commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408':
  Add dpi tests to CTS.
2009-10-08 10:48:20 -07:00
Brett Chabot
45dc54f680 Add speech tests to CTS makefile. 2009-10-08 10:00:37 -07:00
Brett Chabot
30e1f2bdd8 Add dpi tests to CTS. 2009-10-08 10:00:37 -07:00
Brett Chabot
0425394081 am 3c7c8a60: Merge change 22522 into donut
Merge commit '3c7c8a60860f97ac4c7381bd6ed30a43864372da' into eclair

* commit '3c7c8a60860f97ac4c7381bd6ed30a43864372da':
  Add Gesture tests to CTS.
2009-08-29 16:44:39 -07:00
Brett Chabot
759901fa6d Add Gesture tests to CTS. 2009-08-24 17:30:41 -07:00
Phil Dubach
d0088f0e28 am 793817ba: CTS: Add missing make dependencies for application security tests
Merge commit '793817baa1455c410311d79ef6f44cac1c26be9f' into eclair

* commit '793817baa1455c410311d79ef6f44cac1c26be9f':
  CTS: Add missing make dependencies for application security tests
2009-08-24 15:51:51 -07:00
Phil Dubach
793817baa1 CTS: Add missing make dependencies for application security tests
Change-Id: I4d069b18b0da5f49ca9bb377d04732b8222ac137
2009-08-24 15:18:35 -07:00
Phil Dubach
c4d5369c22 am 3b7521b5: CTS: Add application security tests to makefile
Merge commit '3b7521b524de694cb9da277fd1d7493fc41aa0f3' into eclair

* commit '3b7521b524de694cb9da277fd1d7493fc41aa0f3':
  CTS: Add application security tests to makefile
2009-08-24 13:39:32 -07:00
Phil Dubach
3b7521b524 CTS: Add application security tests to makefile
Change-Id: I51291d338cca88fed68247efbecbaf747306c6b7
2009-08-24 11:49:39 -07:00
Phil Dubach
dd6c1e11c5 am 7c463e4b: Merge change 21778 into donut
Merge commit '7c463e4b0565f752bc06feb98962ab1536937aa1' into eclair

* commit '7c463e4b0565f752bc06feb98962ab1536937aa1':
  CTS: Enable Python description/plan generator
2009-08-22 07:43:37 -07:00
Phil Dubach
5e3ab04d97 CTS: Enable Python description/plan generator
This enables the new description/plan generator added in change
21366.
2009-08-19 17:03:21 -07:00
Phil Dubach
378a5884da am c539dbe6: CTS: Add missing integration of 147397 to fix VM tests
Merge commit 'c539dbe6a2810818ac22f180e64bdc0256557532'

* commit 'c539dbe6a2810818ac22f180e64bdc0256557532':
  CTS: Add missing integration of 147397 to fix VM tests
2009-08-11 18:11:22 -07:00
Phil Dubach
c539dbe6a2 CTS: Add missing integration of 147397 to fix VM tests
For host side test packages, the name of the jar file containing the tests is
declared in the packages Android.mk.  The name of the make file needs to be
passed to the description generator so that it can pick up this information.
The makefile was not passing on the parameter containing the make file name.
2009-08-10 14:23:23 -07:00
Joe Onorato
3366c07e56 Tweak the product graph formatting. 2009-08-08 12:15:10 -07:00
Phil Dubach
e7faad965f am 951f3d89: CTS: Add telephony and webkit test cases to CTS makefile
Merge commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3'

* commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3':
  CTS: Add telephony and webkit test cases to CTS makefile
2009-07-30 06:56:47 -07:00
Android (Google) Code Review
a86afb626f am c16c0a41: Merge change 8942 into donut
Merge commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af'

* commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af':
  Add CTS permission2 test package to cts.
2009-07-29 16:44:58 -07:00
Phil Dubach
951f3d89fb CTS: Add telephony and webkit test cases to CTS makefile 2009-07-29 11:58:11 -07:00
Brett Chabot
7b5edc3e8a Add CTS permission2 test package to cts. 2009-07-28 20:11:24 -07:00
Joe Onorato
cffab81686 Make the product graph slightly more readable. 2009-07-28 18:29:19 -07:00
Phil Dubach
571d0f299f CTS: Add media test cases to CTS makefile 2009-07-15 11:11:13 -07:00
Brett Chabot
67bae7fc68 Change cts makefile to bundle junit.jar. 2009-06-27 13:30:38 -07:00
Jason Sams
e3eb0fae99 joeo here. This localize command is unused and causes that execve error. 2009-06-12 11:23:19 -07:00
Phil Dubach
233728de06 am 9e35a86: AI 148675: CTS: Copy only the \'startcts\' script into the cts
Merge commit '9e35a86b833c8bd520c9f889be3f2859a5ed7b45' into donut

* commit '9e35a86b833c8bd520c9f889be3f2859a5ed7b45':
  AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
2009-05-11 11:03:44 -07:00
Phil Dubach
9e35a86b83 AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
Before CL 148645, 'startcts' called the 'cts' script. This is no longer the
  case, so we want to exclude the 'cts' script from the distribution to avoid
  confusion. The 'cts' script is only used when running cts directly on a
  fully built source tree.

Automated import of CL 148675
2009-05-11 11:00:16 -07:00
Jorg Pleumann
1f61dc3e19 am 6178820: AI 148430: Adding a new CTS test runner that is basically
Merge commit '6178820340ccca2656fab0953bbe77da2e3e4bb7' into donut

* commit '6178820340ccca2656fab0953bbe77da2e3e4bb7':
  AI 148430: Adding a new CTS test runner that is basically
2009-05-07 01:36:23 -07:00
Jorg Pleumann
6178820340 AI 148430: Adding a new CTS test runner that is basically
a copy of the old one, but resides in android/cts
  and is built and installed as part of the CTS.
  This makes sure we always have the correct test
  runner on a device, so we should see the various
  improvements also on off-the-shelf Cupcake phones.
  BUG=1537738

Automated import of CL 148430
2009-05-07 01:33:14 -07:00