summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk8
-rwxr-xr-xjni/Android.mk4
-rw-r--r--src/com/android/camera/Mosaic.java2
-rw-r--r--src/com/android/camera/MosaicRenderer.java2
-rw-r--r--src/com/android/camera/tinyplanet/TinyPlanetNative.java2
-rw-r--r--tests/Android.mk6
6 files changed, 13 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk
index f230c07..606aa87 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,7 +22,9 @@ LOCAL_AAPT_FLAGS := \
--version-name "$(version_name_package)" \
--version-code $(version_code_package) \
-LOCAL_PACKAGE_NAME := SnapdragonCamera
+LOCAL_PACKAGE_NAME := Snap
+
+LOCAL_AAPT_FLAGS += --rename-manifest-package org.cyanogenmod.snap
#LOCAL_SDK_VERSION := current
@@ -34,9 +36,9 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
# the libraries in the APK, otherwise just put them in /system/lib and
# leave them out of the APK
ifneq (,$(TARGET_BUILD_APPS))
- LOCAL_JNI_SHARED_LIBRARIES := libjni_snapcammosaic libjni_snapcamtinyplanet
+ LOCAL_JNI_SHARED_LIBRARIES := libjni_snapmosaic libjni_snaptinyplanet
else
- LOCAL_REQUIRED_MODULES := libjni_snapcammosaic libjni_snapcamtinyplanet
+ LOCAL_REQUIRED_MODULES := libjni_snapmosaic libjni_snaptinyplanet
endif
include $(BUILD_PACKAGE)
diff --git a/jni/Android.mk b/jni/Android.mk
index c94a807..b052c09 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -46,7 +46,7 @@ LOCAL_LDFLAGS := -llog -lGLESv2
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libjni_snapcammosaic
+LOCAL_MODULE := libjni_snapmosaic
include $(BUILD_SHARED_LIBRARY)
# TinyPlanet
@@ -55,7 +55,7 @@ include $(CLEAR_VARS)
LOCAL_CPP_EXTENSION := .cc
LOCAL_LDFLAGS := -llog -ljnigraphics
LOCAL_SDK_VERSION := 9
-LOCAL_MODULE := libjni_snapcamtinyplanet
+LOCAL_MODULE := libjni_snaptinyplanet
LOCAL_SRC_FILES := tinyplanet.cc
LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
diff --git a/src/com/android/camera/Mosaic.java b/src/com/android/camera/Mosaic.java
index a9bc32e..829efa5 100644
--- a/src/com/android/camera/Mosaic.java
+++ b/src/com/android/camera/Mosaic.java
@@ -93,7 +93,7 @@ public class Mosaic {
static {
- System.loadLibrary("jni_snapcammosaic");
+ System.loadLibrary("jni_snapmosaic");
}
/**
diff --git a/src/com/android/camera/MosaicRenderer.java b/src/com/android/camera/MosaicRenderer.java
index 5006b36..bcbaf72 100644
--- a/src/com/android/camera/MosaicRenderer.java
+++ b/src/com/android/camera/MosaicRenderer.java
@@ -24,7 +24,7 @@ public class MosaicRenderer
{
static
{
- System.loadLibrary("jni_snapcammosaic");
+ System.loadLibrary("jni_snapmosaic");
}
/**
diff --git a/src/com/android/camera/tinyplanet/TinyPlanetNative.java b/src/com/android/camera/tinyplanet/TinyPlanetNative.java
index 1d456de..8f320a9 100644
--- a/src/com/android/camera/tinyplanet/TinyPlanetNative.java
+++ b/src/com/android/camera/tinyplanet/TinyPlanetNative.java
@@ -23,7 +23,7 @@ import android.graphics.Bitmap;
*/
public class TinyPlanetNative {
static {
- System.loadLibrary("jni_snapcamtinyplanet");
+ System.loadLibrary("jni_snaptinyplanet");
}
/**
diff --git a/tests/Android.mk b/tests/Android.mk
index 6ba0a59..920f8f0 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -11,8 +11,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := littlemock dexmaker
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := Camera2Tests
+LOCAL_PACKAGE_NAME := SnapTests
-LOCAL_INSTRUMENTATION_FOR := Camera2
+LOCAL_INSTRUMENTATION_FOR := Snap
-#include $(BUILD_PACKAGE)
+include $(BUILD_PACKAGE)