diff options
author | Greg Hartman <ghartman@google.com> | 2015-02-23 20:04:52 -0800 |
---|---|---|
committer | Greg Hartman <ghartman@google.com> | 2015-02-24 21:05:01 -0800 |
commit | 08372d76dc1978fd163f7ced83b46cacb7161499 (patch) | |
tree | 09ddea5f84bd83f1e1eaf2f685892c1c4119d986 | |
parent | 6d73fc63a4d9b3454ddfeb6a95387fce4ff95f85 (diff) | |
download | gptfdisk-08372d76dc1978fd163f7ced83b46cacb7161499.tar.gz |
Add host build rules for sgdisk
Change-Id: I204ff8f580c2336c2c9d39bba48596aaaaa6860a
-rw-r--r-- | Android.mk | 27 | ||||
-rw-r--r-- | android_popt.cc | 2 | ||||
-rw-r--r-- | gptcl.h | 4 | ||||
-rw-r--r-- | guid.h | 4 | ||||
-rw-r--r-- | popt.h (renamed from android_popt.h) | 0 |
5 files changed, 23 insertions, 14 deletions
@@ -1,9 +1,6 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := \ +sgdisk_src_files := \ sgdisk.cc \ gptcl.cc \ crc32.cc \ @@ -21,9 +18,29 @@ LOCAL_SRC_FILES := \ diskio-unix.cc \ android_popt.cc \ +include $(CLEAR_VARS) + +LOCAL_CPP_EXTENSION := .cc + +LOCAL_C_INCLUDES := $(LOCAL_PATH) external/e2fsprogs/lib +LOCAL_SRC_FILES := $(sgdisk_src_files) + LOCAL_SHARED_LIBRARIES := libext2_uuid -LOCAL_MODULE_TAGS := optional LOCAL_MODULE := sgdisk include $(BUILD_EXECUTABLE) + +include $(CLEAR_VARS) + +LOCAL_CPP_EXTENSION := .cc + +LOCAL_C_INCLUDES := $(LOCAL_PATH) external/e2fsprogs/lib +LOCAL_SRC_FILES := $(sgdisk_src_files) + +LOCAL_SHARED_LIBRARIES := libext2_uuid_host + +LOCAL_MODULE := sgdisk_host +LOCAL_MODULE_STEM := sgdisk + +include $(BUILD_HOST_EXECUTABLE) diff --git a/android_popt.cc b/android_popt.cc index c5f94d6..a1492c6 100644 --- a/android_popt.cc +++ b/android_popt.cc @@ -11,7 +11,7 @@ * GNU General Public License for more details. */ -#include "android_popt.h" +#include <popt.h> // #define LOCAL_DEBUG @@ -23,11 +23,7 @@ #define __GPTCL_H #include "gpt.h" -#ifdef __ANDROID__ -#include "android_popt.h" -#else #include <popt.h> -#endif using namespace std; @@ -26,11 +26,7 @@ #endif typedef unsigned char my_uuid_t[16]; #else // Not Windows -#ifdef __ANDROID__ -#include <uuid.h> -#else #include <uuid/uuid.h> -#endif typedef uuid_t my_uuid_t; #endif |