diff --git a/Android.mk b/Android.mk
index 298a8d6..54383a5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,23 @@
-# Include the Android.mk in app/src/main
+#
+# Inline Aosp Makefile for Masquerade
+#
+LOCAL_PATH:= $(call my-dir)
 
-LOCAL_DIR := $(call my-dir)
+include $(CLEAR_VARS)
 
-include $(LOCAL_DIR)/app/src/main/Masquerade.mk
+LOCAL_PACKAGE_NAME := masquerade
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MANIFEST_FILE := app/src/main/AndroidManifest.xml
+LOCAL_SRC_FILES := $(call all-java-files-under, app/src/main)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/app/src/main/res
+
+LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
+
+include $(BUILD_PACKAGE)
+
+include $(CLEAR_VARS)
diff --git a/app/src/main/Masquerade.mk b/app/src/main/Masquerade.mk
deleted file mode 100644
index b1fb0bf..0000000
--- a/app/src/main/Masquerade.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Inline Aosp Makefile
-#
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := masquerade
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, java)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
-
-include $(BUILD_PACKAGE)
-
-include $(CLEAR_VARS)