commit eae8c9606df103b28d5f9da84372f873276da34f
author George G <kreach3r@users.noreply.github.com> Sat Aug 20 21:16:29 2016 +0300
committer George G <kreach3r@users.noreply.github.com> Thu Dec 15 05:48:48 2016 +0200
tree 58821435809af1f007fec8f4e6626e5c1c33e5fc
parent 6b6f33e23cd7531b32bb9272e43c637de3bb266f

Makefile cleanup

There is no need for calling multiple files

Change-Id: I46afc11d0f09ff78a979f9b04ed0a754f866d1a1

Android.mk

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)