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

8 files changed, 35 insertions, 4 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))
diff --git a/alsa-lib/Android.mk b/alsa-lib/Android.mk
index 8bd4353..7905630 100644
--- a/alsa-lib/Android.mk
+++ b/alsa-lib/Android.mk
@@ -3,6 +3,7 @@
 # Copyright 2008 Wind River Systems
 #
 
+ifeq ($(TARGET_DEVICE),crespo)
 ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
 
 LOCAL_PATH := $(call my-dir)
@@ -73,4 +74,5 @@ LOCAL_SRC_FILES := $(filter-out src/shmarea.c, $(LOCAL_SRC_FILES))
 include $(BUILD_STATIC_LIBRARY)
 
 endif
+endif
 
diff --git a/alsa-utils/Android.mk b/alsa-utils/Android.mk
index 2609fc1..796e581 100644
--- a/alsa-utils/Android.mk
+++ b/alsa-utils/Android.mk
@@ -1,4 +1,4 @@
-
+ifeq ($(TARGET_DEVICE),crespo)
 ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
 ifeq ($(strip $(BUILD_WITH_ALSA_UTILS)),true)
 
@@ -96,3 +96,4 @@ include $(BUILD_EXECUTABLE)
 
 endif
 endif
+endif
diff --git a/libaudio/Android.mk b/libaudio/Android.mk
index 70908dd..790f63c 100644
--- a/libaudio/Android.mk
+++ b/libaudio/Android.mk
@@ -3,6 +3,7 @@
 # Copyright 2008 Wind River Systems
 #
 
+ifeq ($(TARGET_DEVICE),crespo)
 ifeq ($(filter-out s5pc110 s5pc100 s5p6440,$(TARGET_BOARD_PLATFORM)),)
 ifeq ($(BOARD_USES_GENERIC_AUDIO),false)
 
@@ -79,3 +80,4 @@ include $(BUILD_SHARED_LIBRARY)
 
 endif
 endif
+endif
diff --git a/libcamera/Android.mk b/libcamera/Android.mk
index 192af24..393ee4c 100644
--- a/libcamera/Android.mk
+++ b/libcamera/Android.mk
@@ -1,3 +1,4 @@
+ifeq ($(TARGET_DEVICE),crespo)
 # When zero we link against libqcamera; when 1, we dlopen libqcamera.
 ifeq ($(BOARD_CAMERA_LIBRARIES),libcamera)
 
@@ -42,4 +43,4 @@ LOCAL_MODULE:= libcamera
 include $(BUILD_SHARED_LIBRARY)
 
 endif
-
+endif
diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk
index 8b4df60..8de55ff 100755
--- a/libcopybit/Android.mk
+++ b/libcopybit/Android.mk
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ifeq ($(TARGET_DEVICE),crespo)
 ifeq ($(BOARD_USES_COPYBIT),true)
 
 LOCAL_PATH:= $(call my-dir)
@@ -33,3 +34,4 @@ LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM)
 include $(BUILD_SHARED_LIBRARY)
 
 endif
+endif
diff --git a/liblight/Android.mk b/liblight/Android.mk
index 321526b..c11e827 100755
--- a/liblight/Android.mk
+++ b/liblight/Android.mk
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ifeq ($(TARGET_DEVICE),crespo)
 
 LOCAL_PATH:= $(call my-dir)
 # HAL module implemenation, not prelinked and stored in
@@ -28,3 +29,5 @@ LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM)
 
 include $(BUILD_SHARED_LIBRARY)
+
+endif
diff --git a/recovery/Android.mk b/recovery/Android.mk
index 1313f85..1427d84 100644
--- a/recovery/Android.mk
+++ b/recovery/Android.mk
@@ -1,3 +1,5 @@
+ifeq ($(TARGET_DEVICE),crespo)
+
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -9,3 +11,5 @@ LOCAL_SRC_FILES := recovery_ui.c
 LOCAL_MODULE := librecovery_ui_crespo
 
 include $(BUILD_STATIC_LIBRARY)
+
+endif