diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-04-07 18:45:41 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-04-07 18:45:41 -0700 |
| commit | 5e369a0402856d5514a4908b601fd46ec857cb2d (patch) | |
| tree | a29897a8b1234458c93aafe8bbad94a8e36f8096 | |
| parent | 0ff435ab0bf9d56ffe59a5f1efe66e4aabe02f53 (diff) | |
| download | oprofile-5e369a0402856d5514a4908b601fd46ec857cb2d.tar.gz | |
Completely disable building oprofile on host.
Was trying to build some components even when HAVE_LIBBFD was false.
Change-Id: Ied9aefcc42070ae2e6cd7cc64f7323f72e64dd82
| -rw-r--r-- | libabi/Android.mk | 4 | ||||
| -rw-r--r-- | libdb/Android.mk | 2 | ||||
| -rw-r--r-- | libop/Android.mk | 3 | ||||
| -rw-r--r-- | libopt++/Android.mk | 3 | ||||
| -rw-r--r-- | libpopt/Android.mk | 3 | ||||
| -rw-r--r-- | libregex/Android.mk | 3 | ||||
| -rw-r--r-- | libutil/Android.mk | 3 |
7 files changed, 15 insertions, 6 deletions
diff --git a/libabi/Android.mk b/libabi/Android.mk index ba2f556..c0aca14 100644 --- a/libabi/Android.mk +++ b/libabi/Android.mk @@ -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
\ No newline at end of file +endif diff --git a/libdb/Android.mk b/libdb/Android.mk index e52ef51..071c609 100644 --- a/libdb/Android.mk +++ b/libdb/Android.mk @@ -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 diff --git a/libop/Android.mk b/libop/Android.mk index f3995ec..c402bc5 100644 --- a/libop/Android.mk +++ b/libop/Android.mk @@ -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 diff --git a/libopt++/Android.mk b/libopt++/Android.mk index 5b25c7d..f502fda 100644 --- a/libopt++/Android.mk +++ b/libopt++/Android.mk @@ -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 diff --git a/libpopt/Android.mk b/libpopt/Android.mk index 8f2800d..23aaef9 100644 --- a/libpopt/Android.mk +++ b/libpopt/Android.mk @@ -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 diff --git a/libregex/Android.mk b/libregex/Android.mk index fc70ab3..ba1c4df 100644 --- a/libregex/Android.mk +++ b/libregex/Android.mk @@ -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 diff --git a/libutil/Android.mk b/libutil/Android.mk index 4e4cde9..d1d8d65 100644 --- a/libutil/Android.mk +++ b/libutil/Android.mk @@ -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 |