diff options
| author | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 18:05:18 +0000 |
|---|---|---|
| committer | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 18:05:18 +0000 |
| commit | 2854b8ba43e111aab598fafcc8ffd9feee31d9ef (patch) | |
| tree | 8771b507d15065e035e605a8f2732c641f531781 /testing | |
| parent | 2b1b0ae24e0178e24b5904b65cd24f3c6b90ef71 (diff) | |
| download | chromium_src-2854b8ba43e111aab598fafcc8ffd9feee31d9ef.zip chromium_src-2854b8ba43e111aab598fafcc8ffd9feee31d9ef.tar.gz chromium_src-2854b8ba43e111aab598fafcc8ffd9feee31d9ef.tar.bz2 | |
Remove "chrome" hardcoded suffix from Android .pak path.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10778023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java | 5 | ||||
| -rw-r--r-- | testing/android/native_test.gyp | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java b/testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java index 3046eb7..ad3bab4 100644 --- a/testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java +++ b/testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java @@ -10,6 +10,8 @@ import android.os.Bundle; import android.os.Handler; import android.util.Log; +import org.chromium.base.PathUtils; + // Android's NativeActivity is mostly useful for pure-native code. // Our tests need to go up to our own java classes, which is not possible using // the native activity class loader. @@ -32,6 +34,9 @@ public class ChromeNativeTestActivity extends Activity { return; } + // Needed by path_utils_unittest.cc + PathUtils.setPrivateDataDirectorySuffix("chrome"); + try { loadLibrary(); Bundle extras = this.getIntent().getExtras(); diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp index 3718907..90d080b 100644 --- a/testing/android/native_test.gyp +++ b/testing/android/native_test.gyp @@ -15,10 +15,17 @@ ], 'actions': [ { + 'action_name': 'copy_base_jar', + 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar'], + 'outputs': ['<(PRODUCT_DIR)/replaceme_apk/java/libs/chromium_base.jar'], + 'action': ['cp', '<@(_inputs)', '<@(_outputs)'], + }, + { 'action_name': 'native_test_apk', 'inputs': [ '<(DEPTH)/testing/android/native_test_apk.xml', '<!@(find <(DEPTH)/testing/android -name "*.java")', + '<(PRODUCT_DIR)/replaceme_apk/java/libs/chromium_base.jar', 'native_test_launcher.cc' ], 'outputs': [ @@ -27,7 +34,7 @@ # probably happy to not codesign) but naming should be # fixed. The -debug name is an aspect of the android # SDK antfiles (e.g. ${sdk.dir}/tools/ant/build.xml) - '<(PRODUCT_DIR)/ChromeNativeTests-debug.apk', + '<(PRODUCT_DIR)/replaceme_apk/replaceme-debug.apk', ], 'action': [ 'ant', |