Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Unified Diff: testing/android/native_test_apk.xml

Issue 10223007: Package and load native library in content shell. Add content shell util scripts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nilesh tweak Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/android/java/org/chromium/content_shell/ContentShellActivity.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/android/native_test_apk.xml
diff --git a/testing/android/native_test_apk.xml b/testing/android/native_test_apk.xml
index 41838d246b04d93d8049141501fae85bd87dc8e4..fe2db25eb8bbd366196def54c3346bd6f19150c4 100644
--- a/testing/android/native_test_apk.xml
+++ b/testing/android/native_test_apk.xml
@@ -15,11 +15,6 @@ found in the LICENSE file.
<property name="sdk.dir" location="${env.ANDROID_SDK_ROOT}"/>
<property name="sdk.version" value="${env.ANDROID_SDK_VERSION}"/>
<property name="src" location="."/>
-
- <!-- TODO(jrg): although the source.dir setting points the android
- antfiles to the correct location for finding our java, and our jars
- are rebuilt when the java changes, a re-javac does not trigger a
- re-package of our apk. Fix. -->
<property name="source.dir" location="java"/>
<property name="target" value="android-${env.ANDROID_SDK_VERSION}"/>
@@ -47,9 +42,21 @@ found in the LICENSE file.
<property name="out.dir" location="${PRODUCT_DIR}/replaceme_apk"/>
- <!-- TODO(jrg): should I make this directory specific to the apk? -->
+ <property name="resource.absolute.dir" value="res"/>
<property name="gen.absolute.dir" value="${out.dir}/gen"/>
+ <!-- Nilesh: this is what we should transition to.
+ TODO(jrg): make sure we transition; will involve gyp changes
+ for placing jar outputs in new directory.
+ When we transition we'll probably also want to change
+ generate_native_test.py to copy the jars into java/libs, not
+ just libs (see line 124 or so).
+ -->
+ <!--
+ <property name="jar.libs.dir" value="${out.dir}/java/libs"/>
+ <property name="native.libs.absolute.dir" location="${out.dir}/libs" />
+ -->
+
<import file="${sdk.dir}/tools/ant/build.xml" />
</project>
« no previous file with comments | « content/shell/android/java/org/chromium/content_shell/ContentShellActivity.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698