Permalink
Browse files

Completely disable building oprofile on host.

Was trying to build some components even when HAVE_LIBBFD was false.

Change-Id: Ied9aefcc42070ae2e6cd7cc64f7323f72e64dd82
  • Loading branch information...
j9brown committed Apr 8, 2011
1 parent 0ff435a commit 5e369a0402856d5514a4908b601fd46ec857cb2d
Showing with 15 additions and 6 deletions.
  1. +3 −1 libabi/Android.mk
  2. +2 −0 libdb/Android.mk
  3. +2 −1 libop/Android.mk
  4. +2 −1 libopt++/Android.mk
  5. +2 −1 libpopt/Android.mk
  6. +2 −1 libregex/Android.mk
  7. +2 −1 libutil/Android.mk
View
@@ -30,6 +30,7 @@ LOCAL_MODULE := libabi
include $(BUILD_STATIC_LIBRARY)
# Build libabi on host
+ifeq ($(HAVE_LIBBFD),true)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
@@ -43,6 +44,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libabi
include $(BUILD_HOST_STATIC_LIBRARY)
+endif
# Build opimport on host
ifeq ($(HAVE_LIBBFD),true)
@@ -58,4 +60,4 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := opimport
include $(BUILD_HOST_EXECUTABLE)
-endif
+endif
View
@@ -34,6 +34,7 @@ LOCAL_MODULE := libdb
include $(BUILD_STATIC_LIBRARY)
# Build libdb on host
+ifeq ($(HAVE_LIBBFD),true)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(common_src)
@@ -45,3 +46,4 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libdb
include $(BUILD_HOST_STATIC_LIBRARY)
+endif
View
@@ -38,6 +38,7 @@ LOCAL_MODULE := libop
include $(BUILD_STATIC_LIBRARY)
# Build libop on host
+ifeq ($(HAVE_LIBBFD),true)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(common_src)
@@ -48,4 +49,4 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libop
include $(BUILD_HOST_STATIC_LIBRARY)
-
+endif
View
@@ -16,6 +16,7 @@ LOCAL_PATH:= $(call my-dir)
include $(LOCAL_PATH)/../common.mk
# Build libopt++ on host
+ifeq ($(HAVE_LIBBFD),true)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= popt_options.cpp
@@ -26,4 +27,4 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libopt++
include $(BUILD_HOST_STATIC_LIBRARY)
-
+endif
View
@@ -34,6 +34,7 @@ LOCAL_MODULE := libpopt
include $(BUILD_STATIC_LIBRARY)
# Build libpopt on host
+ifeq ($(HAVE_LIBBFD),true)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(common_src)
@@ -44,4 +45,4 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libpopt
include $(BUILD_HOST_STATIC_LIBRARY)
-
+endif
View
@@ -16,6 +16,7 @@ LOCAL_PATH:= $(call my-dir)
include $(LOCAL_PATH)/../common.mk
# Build libregex on host
+ifeq ($(HAVE_LIBBFD),true)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
@@ -30,4 +31,4 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libop_regex
include $(BUILD_HOST_STATIC_LIBRARY)
-
+endif
View
@@ -40,6 +40,7 @@ LOCAL_MODULE := libutil
include $(BUILD_STATIC_LIBRARY)
# Build libutil on host
+ifeq ($(HAVE_LIBBFD),true)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(common_src)
@@ -50,4 +51,4 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libutil
include $(BUILD_HOST_STATIC_LIBRARY)
-
+endif

0 comments on commit 5e369a0

Please sign in to comment.