Move crepo-conditionals to the leaves.

Two benefits:
-this follows the convention that all Android.mk files are included,
i.e. that reading an Android.mk file shows the entire picture.

-this allows some of the leaves to become non-conditional, to increase
the number of device-specific modules that are compiled in each build,
which allows catching build breakages earlier.

Change-Id: I060a4aecc4b5d53b9ca56f13b8599b8fa560f896

1 files changed, 18 insertions, 2 deletions

diff --git a/Android.mk b/Android.mk
index b2f80b1..f2ce158 100755
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,21 @@
-ifeq ($(TARGET_DEVICE),crespo)
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 LOCAL_PATH := $(call my-dir)
 
+ifeq ($(TARGET_DEVICE),crespo)
+
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := s3c-keypad.kcm
 include $(BUILD_KEY_CHAR_MAP)
@@ -9,5 +24,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := melfas-touchkey.kcm
 include $(BUILD_KEY_CHAR_MAP)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
 endif
+
+include $(call all-makefiles-under,$(LOCAL_PATH))