summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-hung Hsieh2014-10-16 11:22:03 -0500
committerGerrit Code Review2014-10-16 11:22:03 -0500
commit3a3871769130428bc1b8f3de03be7231750e1b82 (patch)
tree5e5600139c51767ff16a9d0b7adb2105cfc72a20
parent7979f1ce5fd771aa9814ef7390f290201ae0790d (diff)
parent84e07fb7a4a5be03193c750e4332dda54a7ecafb (diff)
downloadplatform-system-core-android-l-preview_r2.tar.gz
platform-system-core-android-l-preview_r2.tar.xz
platform-system-core-android-l-preview_r2.zip
Merge "Don't build init with clang for now"android-l-preview_r2
-rw-r--r--init/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/init/Android.mk b/init/Android.mk
index 489dc93e1..72c22724d 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -33,6 +33,10 @@ endif
33 33
34LOCAL_MODULE:= init 34LOCAL_MODULE:= init
35 35
36# Currently, init doesn't start when built with clang.
37# Needs further investigation.
38LOCAL_CLANG := false
39
36LOCAL_FORCE_STATIC_EXECUTABLE := true 40LOCAL_FORCE_STATIC_EXECUTABLE := true
37LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) 41LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
38LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED) 42LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED)