commit 9e83d6702d67aa50213fc2e65ea00e25f906d35f
author Conley Owens <cco3@android.com> Mon Mar 11 20:41:06 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 11 20:41:06 2013 +0000
tree f7ffbeb89368cd4b1e9054ae1b644e9a11ca1e2d
parent 60a9e12e999eefd1113c887e9e6ba52cd839a665
parent aa4b4a4133343d91f1d24d79af67a0724319e28b

Merge "Restore LOCAL_PATH in sdkmanager/app/Android.mk"

sdkmanager/app/Android.mk

diff --git a/sdkmanager/app/Android.mk b/sdkmanager/app/Android.mk
index f72c401..428b8a0 100644
--- a/sdkmanager/app/Android.mk
+++ b/sdkmanager/app/Android.mk
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-LOCAL_PATH := $(call my-dir)
+ORIG_LOCAL_PATH := $(call my-dir)
+LOCAL_PATH := $(ORIG_LOCAL_PATH)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
@@ -49,6 +50,7 @@
 # ----- TESTS ------
 # Copyright (C) 2011 The Android Open Source Project
 
+LOCAL_PATH := $(ORIG_LOCAL_PATH)
 include $(CLEAR_VARS)
 
 # Only compile source java files in this lib.