summaryrefslogtreecommitdiffstats
path: root/build/apk_test.gypi
Commit message (Collapse)AuthorAgeFilesLines
* [Android] Temporarily force gtests to be unmanaged.yfriedman@chromium.org2013-04-111-0/+2
| | | | | | | | | | | There's a little more to support these as managed both in packaging and the scripts that run tests. Disable for now. BUG=158821 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/14198002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193776 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Build gtest APKs like other APKscjhopman@chromium.org2013-04-111-45/+2
| | | | | | | | | | | | After much work, we can build gtest APKs without first transforming .java files, resource files, or the AndroidManifest.xml. We can directly use java_apk.gypi and build like all other APKs. Do that. Also, native_test_apk.xml was the last user of common.xml and sdk-targets.xml, and so those can now be removed. Review URL: https://chromiumcodereview.appspot.com/13828003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193576 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Use the build-generated list of libraries for gtest APKscjhopman@chromium.org2013-04-111-0/+1
| | | | | | | | | | | | | | | For normal APKs, the build generates a list of libraries to load at build time and this is used at runtime to load libraries. Update our gtest APKs to use this. This makes gtest APKs work in the component build. BUG=158821 Review URL: https://chromiumcodereview.appspot.com/13962003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193536 0039d316-1c4b-4281-b951-d872f2087c98
* Use java_apk.gypi for gtest apkscjhopman@chromium.org2013-04-061-62/+54
| | | | | | | | | | | | | | | | | | | | | | | | Currently, normal APKs and instrumentation APKs are both built using java_apk.gypi (which includes all kinds of new hotness). Native unittest APKs, though use apk_test.gypi and thus the complicated native_test_apk.xml and Android's Ant build.xml. That is bad. This change updates apk_test.gypi to include java_apk.gypi and so brings these two ways of building APKs into alignment. It also very slightly updates the configurability of java_apk.gypi and apk-package.xml. There are still a couple of targets in WebKit that use generate_native_test.py and native_test_apk.xml directly that need to be updated to use apk_test.gypi before those two scripts can be simplified/removed. BUG=158821 Review URL: https://chromiumcodereview.appspot.com/13564003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192662 0039d316-1c4b-4281-b951-d872f2087c98
* Suppress Ant build noisecjhopman@chromium.org2013-04-051-1/+4
| | | | | | | | | | | | Use a simple wrapper script for calling ant. This allows us to suppress the "BUILD SUCCESSFUL" + timing output from ant. BUG=164395 Review URL: https://chromiumcodereview.appspot.com/13470026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192478 0039d316-1c4b-4281-b951-d872f2087c98
* Move ant call from python to gypcjhopman@chromium.org2013-02-201-12/+24
| | | | | | | | | | | | | | | | | All of our APKs should be built with build/java_apk.gypi. Currently, native test APKs are built very differently. This change makes them build more like other apks, as a first step to using java_apk.gypi. Since WebKit's gyp files use generate_native_test.py directly, rather than including apk_test.gypi, generate_native_test.py needs to continue to support using it for ant compilation. :( BUG=177121 Review URL: https://chromiumcodereview.appspot.com/12310002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183614 0039d316-1c4b-4281-b951-d872f2087c98
* Add dependency on Android tools to native unittests APKs targetsppi@chromium.org2012-12-181-0/+1
| | | | | | | | | | | | This patch adds dependencies on Android tools (port forwarder and md5 util used for conditional file pushes) required to run native unittests APKs to the APKs targets. BUG=161257 Review URL: https://chromiumcodereview.appspot.com/11597008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173728 0039d316-1c4b-4281-b951-d872f2087c98
* Reduce verbosity of Android builds.yfriedman@chromium.org2012-12-181-0/+2
| | | | | | | | | | | There's a lot of boilerplate from running ant. Passing '-q' silences most of it. BUG=164395 NOTRY=True Review URL: https://chromiumcodereview.appspot.com/11606010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173688 0039d316-1c4b-4281-b951-d872f2087c98
* Remove hardcoded chromium_*.jar pathscjhopman@chromium.org2012-12-051-8/+5
| | | | | | | | | | | | | | | | | | | | | Targets with dependencies (direct/indirect) on a java target receive the chromium_*.jar paths in the variable input_jars_paths. Targets should use that rather than hardcoding where they think the jar will be. Change native_test_apk.xml to build with a list of jars in INPUT_JARS_PATHS rather than using all jars in a specific output directory. Make generate_native_test.py pass the --jars argument to ant with -DINPUT_JARS_PATHS. This supports those targets (WebKit) that are not updated to pass the ant-arg directly. BUG= Review URL: https://chromiumcodereview.appspot.com/11308351 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171131 0039d316-1c4b-4281-b951-d872f2087c98
* Nuke unused test code.shashishekhar@chromium.org2012-10-101-1/+0
| | | | | | | | | | SDK build is the default build, we do not need Android.mk based compilation. Review URL: https://chromiumcodereview.appspot.com/11066094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161127 0039d316-1c4b-4281-b951-d872f2087c98
* Remove {base,net}_java dependencies from GYP client targets on Android.pliard@chromium.org2012-09-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | On Android, some GYP client targets were explicitly depending on both the native and Java sides of a library. This removes the dependencies to {base,net}_java and make the native side ('base' and 'net) of these libraries depend on their Java counterpart. On Android it rarely makes sense to depend on a single side of a Java/C++ library. The {base,net}_java can now be considered as "private" targets although GYP does not support this concept unfortunately (AFAICT). Note that I made sure that the resulting APKs' size is unchanged. Additionally, this CL removes 'base_java' (i.e. does not replace it with 'base') from the targets including 'build/apk_test.gypi'. This dependency should not have been there (in the wrong layer) in the first place. It's needed by ChromeNativeTestActivity.java which clients should not know about. BUG=146323 TBR=lipalani,sky,willchan,brettw Review URL: https://chromiumcodereview.appspot.com/10913083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155737 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the gdb path for NDK-r8b.michaelbai@chromium.org2012-09-061-2/+0
| | | | | | | | | | | | | - Removed android.toolchain property. - Added android.gdbserver property. - Changed property-location to check the both file and directory's existence. TBR=jam BUG= Review URL: https://chromiumcodereview.appspot.com/10823435 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155108 0039d316-1c4b-4281-b951-d872f2087c98
* Add gdb server variable for antmichaelbai@chromium.org2012-08-301-0/+2
| | | | | | | | | | | | | | | | | | | This is the first CL to replace the ant property toolchain.dir with android.gdbserver. After this submitted - Add android_gdbserver into WebKit gypis. - Retire the toolchain.dir from ant by using android.gdbserver. - Remove the ANDROID_TOOLCHAIN from both WebKit and chromium's gyp/gypi - Remove the android_toolchain from envsetup_function.sh TBR=jam BUG= Review URL: https://chromiumcodereview.appspot.com/10886046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154298 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the dependency on the STRIP env variable for Androidpeter@chromium.org2012-08-161-0/+1
| | | | | | | | | | | | Android builds currently rely on the STRIP environment variable to be available during build time, rather than just at project generation time. It shouldn't. BUG=142642 Review URL: https://chromiumcodereview.appspot.com/10832295 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151886 0039d316-1c4b-4281-b951-d872f2087c98
* Remove uses of Android's test runner's --ant-compile, as well as the flag ↵peter@chromium.org2012-08-151-1/+0
| | | | | | | | | | | | | | itself. It has been superseded by --sdk-build, which has already been set for all other Chromium and WebKit users. BUG= Review URL: https://chromiumcodereview.appspot.com/10855147 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151709 0039d316-1c4b-4281-b951-d872f2087c98
* Android's native_tests.gyp should take WebKit's directory structure into ↵peter@chromium.org2012-08-131-0/+2
| | | | | | | | | | | | account. This broke the WebKit Chromium Android bot. BUG=142322 Review URL: https://chromiumcodereview.appspot.com/10829291 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151257 0039d316-1c4b-4281-b951-d872f2087c98
* Make java.gypi export jar path to input_jars_paths variablecjhopman@chromium.org2012-08-091-2/+5
| | | | | | | | | | | | | | | | | Both java.gypi and apk_test.gypi expect the jar path in input_jars_paths. This means that we were specifying the dependence in both 'dependencies' and 'input_jars_paths'. This change makes it so that we don't need that redundancy. Also, make java.gypi use input_jars_paths in its input so that we actually rebuild targets when we should. BUG=136756 Review URL: https://chromiumcodereview.appspot.com/10837143 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150850 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Add chrome_java target for building Java code in the chromium layer.yfriedman@chromium.org2012-08-061-1/+12
| | | | | | | | | | | Also includes a refactoring of the Ant xml scripts to use a common template (contributed by shashishekhar@chromium.org). As part of this, I also continued Torne's effort of removing our reliance on environment variables. Unfortunately this currently means that you have to specify 5 gyp flags: ANDROID_SDK, ANDROID_SDK_ROOT, ANDROID_SDK_TOOLS, ANDROID_SDK_VERSION, ANDROID_TOOLCHAIN. This'll get better as we make further use of the checked in sdk both upstream and downstream. The problem stems from the android tree and released sdk having different configurations. Review URL: https://chromiumcodereview.appspot.com/10830012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150172 0039d316-1c4b-4281-b951-d872f2087c98
* Introduce the --sdk-build flag for Android's native test generatorpeter@chromium.org2012-08-011-1/+1
| | | | | | | | | | | | | This flag supersedes --ant-compile and takes its value from gyp's sdk_build variable. It will tell the native test generator script to use Ant for Java compilation (default) instead of the Android.mk file. BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10821128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149440 0039d316-1c4b-4281-b951-d872f2087c98
* Add the target ABI option for apk based test runneryongsheng.zhu@intel.com2012-05-301-0/+2
| | | | | | | | | | | | | | Remove the hardcode directory name 'armeabi' and replace it with the Android target ABI information. Trivial gyp changes that are android-specific; TBRing some owners TBR=mark@chromium.org,jam@chromium.org,sky@chromium.org BUG=128944 TEST= Review URL: https://chromiumcodereview.appspot.com/10383263 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139512 0039d316-1c4b-4281-b951-d872f2087c98
* Fix ninja build for android.yfriedman@chromium.org2012-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The primary issues is specifying the right path to PRODUCT_DIR (i.e. out/Release). The gyp generator for make specifies the absolute path but for ninja would use a relative path. Since the gyp targets don't line up with where the ant build files are located this causes failures such as base's java being generated in base/android/out/Release/... See: https://groups.google.com/forum/#!msg/gyp-developer/K2T_9obUya0/qq78_Ut-E-AJ for details. A couple of other minor fixes: - content java files are placed in out/Release/java/content to be consisent with other packages. - shared-libraries are now referenced by correct variables for apk-based tests - removed unused media/base/android/java/java.gyp (target is in media/media.gyp) TBR=mark@chromium.org,ben@chromium.org,rsleevi@chromium.org Review URL: https://chromiumcodereview.appspot.com/10386188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139418 0039d316-1c4b-4281-b951-d872f2087c98
* Add APK targets for content_unittests and net_unittests.nileshagrawal@chromium.org2012-05-251-0/+55
- Add a gyp template to simplify adding new targets. - Add support for multiple jars in the test APK. BUG=125059 TEST= Review URL: https://chromiumcodereview.appspot.com/10399126 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139106 0039d316-1c4b-4281-b951-d872f2087c98