Index: /issm/trunk-jpl/src/android/HelloWorldProject/build.xml =================================================================== --- /issm/trunk-jpl/src/android/HelloWorldProject/build.xml (revision 11770) +++ /issm/trunk-jpl/src/android/HelloWorldProject/build.xml (revision 11771) @@ -1,4 +1,4 @@ - + + + + + + + + + + + + + + + + + + + + + Index: /issm/trunk-jpl/src/android/two-libs/gen/R.java.d =================================================================== --- /issm/trunk-jpl/src/android/two-libs/gen/R.java.d (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/gen/R.java.d (revision 11771) @@ -0,0 +1,3 @@ +/Users/gperez/issm/trunk-jpl/src/android/two-libs/gen/com/example/twolibs/R.java \ + : /Users/gperez/issm/trunk-jpl/src/android/two-libs/res/values/strings.xml \ +/Users/gperez/issm/trunk-jpl/src/android/two-libs/AndroidManifest.xml \ Index: /issm/trunk-jpl/src/android/two-libs/gen/com/example/twolibs/R.java =================================================================== --- /issm/trunk-jpl/src/android/two-libs/gen/com/example/twolibs/R.java (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/gen/com/example/twolibs/R.java (revision 11771) @@ -0,0 +1,16 @@ +/* AUTO-GENERATED FILE. DO NOT MODIFY. + * + * This class was automatically generated by the + * aapt tool from the resource data it found. It + * should not be modified by hand. + */ + +package com.example.twolibs; + +public final class R { + public static final class attr { + } + public static final class string { + public static final int app_name=0x7f020000; + } +} Index: /issm/trunk-jpl/src/android/two-libs/jni/Android.mk =================================================================== --- /issm/trunk-jpl/src/android/two-libs/jni/Android.mk (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/jni/Android.mk (revision 11771) @@ -0,0 +1,41 @@ +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# the purpose of this sample is to demonstrate how one can +# generate two distinct shared libraries and have them both +# uploaded in +# + +LOCAL_PATH:= $(call my-dir) + +# first lib, which will be built statically +# +include $(CLEAR_VARS) + +LOCAL_MODULE := libtwolib-first +LOCAL_SRC_FILES := first.c + +include $(BUILD_STATIC_LIBRARY) + +# second lib, which will depend on and include the first one +# +include $(CLEAR_VARS) + +LOCAL_MODULE := libtwolib-second +LOCAL_SRC_FILES := second.c + +LOCAL_STATIC_LIBRARIES := libtwolib-first + +include $(BUILD_SHARED_LIBRARY) Index: /issm/trunk-jpl/src/android/two-libs/jni/first.c =================================================================== --- /issm/trunk-jpl/src/android/two-libs/jni/first.c (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/jni/first.c (revision 11771) @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +#include "first.h" + +int first(int x, int y) +{ + return x + y; +} Index: /issm/trunk-jpl/src/android/two-libs/jni/first.h =================================================================== --- /issm/trunk-jpl/src/android/two-libs/jni/first.h (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/jni/first.h (revision 11771) @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +#ifndef FIRST_H +#define FIRST_H + +extern int first(int x, int y); + +#endif /* FIRST_H */ Index: /issm/trunk-jpl/src/android/two-libs/jni/second.c =================================================================== --- /issm/trunk-jpl/src/android/two-libs/jni/second.c (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/jni/second.c (revision 11771) @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +#include "first.h" +#include + +jint +Java_com_example_twolibs_TwoLibs_add( JNIEnv* env, + jobject this, + jint x, + jint y ) +{ + return first(x, y); +} Index: /issm/trunk-jpl/src/android/two-libs/obj/local/armeabi/objs/twolib-first/first.o.d =================================================================== --- /issm/trunk-jpl/src/android/two-libs/obj/local/armeabi/objs/twolib-first/first.o.d (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/obj/local/armeabi/objs/twolib-first/first.o.d (revision 11771) @@ -0,0 +1,3 @@ +obj/local/armeabi/objs/twolib-first/first.o: jni/first.c jni/first.h + +jni/first.h: Index: /issm/trunk-jpl/src/android/two-libs/obj/local/armeabi/objs/twolib-second/second.o.d =================================================================== --- /issm/trunk-jpl/src/android/two-libs/obj/local/armeabi/objs/twolib-second/second.o.d (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/obj/local/armeabi/objs/twolib-second/second.o.d (revision 11771) @@ -0,0 +1,6 @@ +obj/local/armeabi/objs/twolib-second/second.o: jni/second.c jni/first.h \ + /Users/gperez/issm/trunk-jpl/externalpackages/android-ndk/install/platforms/android-3/arch-arm/usr/include/jni.h + +jni/first.h: + +/Users/gperez/issm/trunk-jpl/externalpackages/android-ndk/install/platforms/android-3/arch-arm/usr/include/jni.h: Index: /issm/trunk-jpl/src/android/two-libs/proguard.cfg =================================================================== --- /issm/trunk-jpl/src/android/two-libs/proguard.cfg (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/proguard.cfg (revision 11771) @@ -0,0 +1,40 @@ +-optimizationpasses 5 +-dontusemixedcaseclassnames +-dontskipnonpubliclibraryclasses +-dontpreverify +-verbose +-optimizations !code/simplification/arithmetic,!field/*,!class/merging/* + +-keep public class * extends android.app.Activity +-keep public class * extends android.app.Application +-keep public class * extends android.app.Service +-keep public class * extends android.content.BroadcastReceiver +-keep public class * extends android.content.ContentProvider +-keep public class * extends android.app.backup.BackupAgentHelper +-keep public class * extends android.preference.Preference +-keep public class com.android.vending.licensing.ILicensingService + +-keepclasseswithmembernames class * { + native ; +} + +-keepclasseswithmembers class * { + public (android.content.Context, android.util.AttributeSet); +} + +-keepclasseswithmembers class * { + public (android.content.Context, android.util.AttributeSet, int); +} + +-keepclassmembers class * extends android.app.Activity { + public void *(android.view.View); +} + +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} + +-keep class * implements android.os.Parcelable { + public static final android.os.Parcelable$Creator *; +} Index: /issm/trunk-jpl/src/android/two-libs/project.properties =================================================================== --- /issm/trunk-jpl/src/android/two-libs/project.properties (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/project.properties (revision 11771) @@ -0,0 +1,11 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 Index: /issm/trunk-jpl/src/android/two-libs/res/values/strings.xml =================================================================== --- /issm/trunk-jpl/src/android/two-libs/res/values/strings.xml (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/res/values/strings.xml (revision 11771) @@ -0,0 +1,4 @@ + + + TwoLib + Index: /issm/trunk-jpl/src/android/two-libs/src/com/example/twolibs/TwoLibs.java =================================================================== --- /issm/trunk-jpl/src/android/two-libs/src/com/example/twolibs/TwoLibs.java (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/src/com/example/twolibs/TwoLibs.java (revision 11771) @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.twolibs; + +import android.app.Activity; +import android.widget.TextView; +import android.os.Bundle; + +public class TwoLibs extends Activity +{ + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + + TextView tv = new TextView(this); + int x = 1000; + int y = 42; + + // here, we dynamically load the library at runtime + // before calling the native method. + // + System.loadLibrary("twolib-second"); + + int z = add(x, y); + + tv.setText( "The sum of " + x + " and " + y + " is " + z ); + setContentView(tv); + } + + public native int add(int x, int y); +} Index: /issm/trunk-jpl/src/android/two-libs/tests/AndroidManifest.xml =================================================================== --- /issm/trunk-jpl/src/android/two-libs/tests/AndroidManifest.xml (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/tests/AndroidManifest.xml (revision 11771) @@ -0,0 +1,21 @@ + + + + + + + + + + Index: /issm/trunk-jpl/src/android/two-libs/tests/default.properties =================================================================== --- /issm/trunk-jpl/src/android/two-libs/tests/default.properties (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/tests/default.properties (revision 11771) @@ -0,0 +1,11 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "build.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-3 Index: /issm/trunk-jpl/src/android/two-libs/tests/src/com/example/TwoLib/TwoLibTest.java =================================================================== --- /issm/trunk-jpl/src/android/two-libs/tests/src/com/example/TwoLib/TwoLibTest.java (revision 11771) +++ /issm/trunk-jpl/src/android/two-libs/tests/src/com/example/TwoLib/TwoLibTest.java (revision 11771) @@ -0,0 +1,21 @@ +package com.example.TwoLib; + +import android.test.ActivityInstrumentationTestCase; + +/** + * This is a simple framework for a test of an Application. See + * {@link android.test.ApplicationTestCase ApplicationTestCase} for more information on + * how to write and extend Application tests. + *

+ * 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 + */ +public class TwoLibTest extends ActivityInstrumentationTestCase { + + public TwoLibTest() { + super("com.example.TwoLib", TwoLib.class); + } + +}