Fix Android.mk

Use ":=" instead of "=".
The vars should be set outside the if..else.. block, because they are
used outside the block.

Change-Id: I1e57cbef0843841c6ccd7051f068f663863ecee6

1 files changed, 14 insertions, 18 deletions

diff --git a/mock-ril/Android.mk b/mock-ril/Android.mk
index daa8e43..8f902e4 100644
--- a/mock-ril/Android.mk
+++ b/mock-ril/Android.mk
@@ -4,27 +4,25 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-ifeq ($(TARGET_ARCH),arm)
+# Directories of source files
+src_cpp := src/cpp
+src_java := src/java
+src_py := src/py
+src_js := src/js
+src_proto := src/proto
+src_generated := src/generated
+
+# Directories of generated source files
+gen_src_cpp := $(src_generated)/cpp
+gen_src_java := $(src_generated)/java
+gen_src_py := $(src_generated)/python
+gen_src_desc := $(src_generated)/desc
 
+ifeq ($(TARGET_ARCH),arm)
 # Mock-ril only buid for debug variants
 ifneq ($(filter userdebug eng tests, $(TARGET_BUILD_VARIANT)),)
 
 include $(CLEAR_VARS)
-
-# Directories of source files
-src_cpp=src/cpp
-src_java=src/java
-src_py=src/py
-src_js=src/js
-src_proto=src/proto
-src_generated=src/generated
-
-# Directories of generated source files
-gen_src_cpp=$(src_generated)/cpp
-gen_src_java=$(src_generated)/java
-gen_src_py=$(src_generated)/python
-gen_src_desc=$(src_generated)/desc
-
 LOCAL_SRC_FILES:= \
     $(src_cpp)/ctrl_server.cpp \
     $(src_cpp)/experiments.cpp \
@@ -42,7 +40,6 @@ LOCAL_SRC_FILES:= \
     $(gen_src_cpp)/ctrl.pb.cpp \
     $(gen_src_cpp)/msgheader.pb.cpp
 
-
 LOCAL_SHARED_LIBRARIES := \
     libz libcutils libutils libril
 
@@ -77,7 +74,6 @@ LOCAL_MODULE:= libmock_ril
 include $(BUILD_SHARED_LIBRARY)
 
 endif
-
 endif
 
 # Java librilproto