Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc3b8521 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

resolve merge conflicts of 8416096f to nyc-dev-plus-aosp 

Change-Id: I1638601fe84dda01bf52c59eb6c976bc1fe37498
parents 775c73f6 8416096f

Android.mk

+2 −4
Original line number Diff line number Diff line
@@ -1048,10 +1048,8 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk 
include $(BUILD_DROIDDOC)



static_doc_index_redirect := $(out_dir)/index.html

$(static_doc_index_redirect): \

	$(LOCAL_PATH)/docs/docs-preview-index.html | $(ACP)

	$(hide) mkdir -p $(dir $@)

	$(hide) $(ACP) $< $@

$(static_doc_index_redirect): $(LOCAL_PATH)/docs/docs-preview-index.html

	$(copy-file-to-target)



$(full_target): $(static_doc_index_redirect)

$(full_target): $(framework_built)

cmds/bmgr/Android.mk

+8 −7
Original line number Diff line number Diff line 
# 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)

cmds/ime/Android.mk

+8 −7
Original line number Diff line number Diff line 
# 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 := ime

LOCAL_MODULE := imelib

LOCAL_MODULE_STEM := ime

include $(BUILD_JAVA_LIBRARY)





include $(CLEAR_VARS)

ALL_PREBUILT += $(TARGET_OUT)/bin/ime

$(TARGET_OUT)/bin/ime : $(LOCAL_PATH)/ime | $(ACP)

	$(transform-prebuilt-to-target)

LOCAL_MODULE := ime

LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_SRC_FILES := ime

LOCAL_REQUIRED_MODULES := imelib

include $(BUILD_PREBUILT)

cmds/input/Android.mk

+8 −5
Original line number Diff line number Diff line 
# Copyright 2008 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 := input

LOCAL_MODULE := inputlib

LOCAL_MODULE_STEM := input

include $(BUILD_JAVA_LIBRARY)



include $(CLEAR_VARS)

ALL_PREBUILT += $(TARGET_OUT)/bin/input

$(TARGET_OUT)/bin/input : $(LOCAL_PATH)/input | $(ACP)

	$(transform-prebuilt-to-target)
 
LOCAL_MODULE := input

LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_SRC_FILES := input

LOCAL_REQUIRED_MODULES := inputlib

include $(BUILD_PREBUILT)

cmds/pm/Android.mk

+8 −7
Original line number Diff line number Diff line 
# 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 := pm

LOCAL_MODULE := pmlib

LOCAL_MODULE_STEM := pm

include $(BUILD_JAVA_LIBRARY)





include $(CLEAR_VARS)

ALL_PREBUILT += $(TARGET_OUT)/bin/pm

$(TARGET_OUT)/bin/pm : $(LOCAL_PATH)/pm | $(ACP)

	$(transform-prebuilt-to-target)

LOCAL_MODULE := pm

LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_SRC_FILES := pm

LOCAL_REQUIRED_MODULES := pmlib

include $(BUILD_PREBUILT)