diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-03-23 15:31:32 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-03-23 15:31:32 -0700 |
| commit | dc3b8521256eaec189e8dd6335df40fd2493adb1 (patch) | |
| tree | a2d0d50f3c26ac182f66ef0110945e2b6baa5b78 /cmds/bmgr | |
| parent | 775c73f6474522fdb7f4496ad22762d6d1b71702 (diff) | |
| parent | 8416096fe88567630cece9213fb2583c4149b019 (diff) | |
resolve merge conflicts of 8416096 to nyc-dev-plus-aosp
Change-Id: I1638601fe84dda01bf52c59eb6c976bc1fe37498
Diffstat (limited to 'cmds/bmgr')
| -rw-r--r-- | cmds/bmgr/Android.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cmds/bmgr/Android.mk b/cmds/bmgr/Android.mk index 8a1670b2ccff..d520cf2143ee 100644 --- a/cmds/bmgr/Android.mk +++ b/cmds/bmgr/Android.mk @@ -1,15 +1,16 @@ # Copyright 2007 The Android Open Source Project # LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := bmgr +LOCAL_MODULE := bmgrlib +LOCAL_MODULE_STEM := bmgr include $(BUILD_JAVA_LIBRARY) - include $(CLEAR_VARS) -ALL_PREBUILT += $(TARGET_OUT)/bin/bmgr -$(TARGET_OUT)/bin/bmgr : $(LOCAL_PATH)/bmgr | $(ACP) - $(transform-prebuilt-to-target) - +LOCAL_MODULE := bmgr +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_SRC_FILES := bmgr +LOCAL_REQUIRED_MODULES := bmgrlib +include $(BUILD_PREBUILT) |