LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fixed wrong package names in samples hello-jni and two-libs"

Browse Source
This commit is contained in:
Andrew Hsieh
2012-06-28 09:57:22 -07:00
committed by android code review
parent c7c40b68a2 1513e9eab2
commit 568cb2b2ef
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndk/samples/hello-jni/jni/hello-jni.c
View File

@@ -21,7 +21,7 @@
* to return a new VM String. See the corresponding Java source
* file located at:
*
* apps/samples/hello-jni/project/src/com/example/HelloJni/HelloJni.java
* apps/samples/hello-jni/project/src/com/example/hellojni/HelloJni.java
*/
jstring
Java_com_example_hellojni_HelloJni_stringFromJNI( JNIEnv* env,

2
ndk/samples/hello-jni/src/com/example/hellojni/HelloJni.java
View File

@@ -57,7 +57,7 @@ public class HelloJni extends Activity
/* this is used to load the 'hello-jni' library on application
* startup. The library has already been unpacked into
* /data/data/com.example.HelloJni/lib/libhello-jni.so at
* /data/data/com.example.hellojni/lib/libhello-jni.so at
* installation time by the package manager.
*/
static {

8
ndk/samples/hello-jni/tests/AndroidManifest.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.HelloJni.tests"
package="com.example.hellojni.tests"
android:versionCode="1"
android:versionName="1.0">
<!-- We add an application tag here just so that we can indicate that
@@ -12,10 +12,10 @@
</application>
<!--
This declares that this application uses the instrumentation test runner targeting
the package of com.example.HelloJni. To run the tests use the command:
"adb shell am instrument -w com.example.HelloJni.tests/android.test.InstrumentationTestRunner"
the package of com.example.hellojni. To run the tests use the command:
"adb shell am instrument -w com.example.hellojni.tests/android.test.InstrumentationTestRunner"
-->
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.example.HelloJni"
android:targetPackage="com.example.hellojni"
android:label="Tests for HelloJni"/>
</manifest>

8
ndk/samples/hello-jni/tests/src/com/example/HelloJni/HelloJniTest.java → ndk/samples/hello-jni/tests/src/com/example/hellojni/HelloJniTest.java
View File

@@ -1,4 +1,4 @@
package com.example.HelloJni;
package com.example.hellojni;
import android.test.ActivityInstrumentationTestCase;
@@ -9,13 +9,13 @@ import android.test.ActivityInstrumentationTestCase;
* <p/>
* To run this test, you can type:
* adb shell am instrument -w \
* -e class com.example.HelloJni.HelloJniTest \
* com.example.HelloJni.tests/android.test.InstrumentationTestRunner
* -e class com.example.hellojni.HelloJniTest \
* com.example.hellojni.tests/android.test.InstrumentationTestRunner
*/
public class HelloJniTest extends ActivityInstrumentationTestCase<HelloJni> {
public HelloJniTest() {
super("com.example.HelloJni", HelloJni.class);
super("com.example.hellojni", HelloJni.class);
}
}

2
ndk/samples/two-libs/res/values/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">TwoLib</string>
<string name="app_name">TwoLibs</string>
</resources>

10
ndk/samples/two-libs/tests/AndroidManifest.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.TwoLib.tests"
package="com.example.twolibs.tests"
android:versionCode="1"
android:versionName="1.0">
<!-- We add an application tag here just so that we can indicate that
@@ -12,10 +12,10 @@
</application>
<!--
This declares that this application uses the instrumentation test runner targeting
the package of com.example.TwoLib. To run the tests use the command:
"adb shell am instrument -w com.example.TwoLib.tests/android.test.InstrumentationTestRunner"
the package of com.example.twolibs. To run the tests use the command:
"adb shell am instrument -w com.example.twolibs.tests/android.test.InstrumentationTestRunner"
-->
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.example.TwoLib"
android:label="Tests for TwoLib"/>
android:targetPackage="com.example.twolibs"
android:label="Tests for TwoLibs"/>
</manifest>

12
ndk/samples/two-libs/tests/src/com/example/TwoLib/TwoLibTest.java → ndk/samples/two-libs/tests/src/com/example/twolibs/TwoLibsTest.java
View File

@@ -1,4 +1,4 @@
package com.example.TwoLib;
package com.example.twolibs;
import android.test.ActivityInstrumentationTestCase;
@@ -9,13 +9,13 @@ import android.test.ActivityInstrumentationTestCase;
* <p/>
* To run this test, you can type:
* adb shell am instrument -w \
* -e class com.example.TwoLib.TwoLibTest \
* com.example.TwoLib.tests/android.test.InstrumentationTestRunner
* -e class com.example.twolibs.TwoLibsTest \
* com.example.twolibs.tests/android.test.InstrumentationTestRunner
*/
public class TwoLibTest extends ActivityInstrumentationTestCase<TwoLib> {
public class TwoLibsTest extends ActivityInstrumentationTestCase<TwoLibs> {
public TwoLibTest() {
super("com.example.TwoLib", TwoLib.class);
public TwoLibsTest() {
super("com.example.twolibs", TwoLibs.class);
}
}