commit e46a75a0f6007967cd0d161959af844772cdc330
author Brian Carlstrom <bdc@google.com> Fri Jun 27 16:03:06 2014 -0700
committer Brian Carlstrom <bdc@google.com> Tue Jul 08 15:12:07 2014 -0700
tree 74be10a4e414e60bbc4825aee9f2f9278fc4da2b
parent f9cfae24123bae199a07bee2dd1c307906c6e6d0

Make dex2oat heap size product configurable [frameworks/native]

Bug: 15919420
Change-Id: I0e629ff4f7541f0dde7380e0dbc8dab1c13df7bd

cmds/installd/Android.mk

diff --git a/cmds/installd/Android.mk b/cmds/installd/Android.mk
index e11b4f8..8224e94 100644
--- a/cmds/installd/Android.mk
+++ b/cmds/installd/Android.mk
@@ -1,21 +1,18 @@
 LOCAL_PATH := $(call my-dir)
 
-common_src_files := \
-    commands.c utils.c
+common_src_files := commands.c utils.c
+common_cflags := -Wall -Werror
 
 #
 # Static library used in testing and executable
 #
 
 include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    $(common_src_files)
-
 LOCAL_MODULE := libinstalld
-
 LOCAL_MODULE_TAGS := eng tests
-
+LOCAL_SRC_FILES := $(common_src_files)
+LOCAL_CFLAGS := $(common_cflags)
+LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
 include $(BUILD_STATIC_LIBRARY)
 
 #
@@ -23,21 +20,11 @@
 #
 
 include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    installd.c \
-    $(common_src_files)
-
-LOCAL_SHARED_LIBRARIES := \
-    libcutils \
-    liblog \
-    libselinux
-
-LOCAL_STATIC_LIBRARIES := \
-    libdiskusage
-
 LOCAL_MODULE := installd
-
 LOCAL_MODULE_TAGS := optional
-
+LOCAL_CFLAGS := $(common_cflags)
+LOCAL_SRC_FILES := installd.c $(common_src_files)
+LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux
+LOCAL_STATIC_LIBRARIES := libdiskusage
+LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
 include $(BUILD_EXECUTABLE)