Fix Makefile for non embedded ROMs

Change-Id: Ia8d80b0fe392b0f7388d9b1e00d29c255d14313f

diff --git a/Android.mk b/Android.mk
index 597b881..2b4db49 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -2,7 +2,6 @@
 # su is built here, and 
 
 my_path := $(call my-dir)
-LOCAL_PATH := $(my_path)
 
 ifdef SUPERUSER_EMBEDDED
 SUPERUSER_PACKAGE := com.android.settings
@@ -14,6 +13,7 @@ include $(my_path)/Superuser/Android.mk
 endif
 
 
+LOCAL_PATH := $(my_path)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := su

diff --git a/Superuser/Superuser.iml b/Superuser/Superuser.iml
index 040b1c3..78ef019 100644 (file)
--- a/Superuser/Superuser.iml
+++ b/Superuser/Superuser.iml
@@ -11,7 +11,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.2.2" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android 4.2.2 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="Widgets" />
   </component>