StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure prebuilt executables are executable" into nyc-dev

Browse Source
This commit is contained in:
Dan Willemsen
2016-04-11 19:59:10 +00:00
committed by Android (Google) Code Review
parent 18da8dd97a 23f326a67d
commit 758f872836
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/prebuilt_internal.mk
View File

@@ -341,12 +341,21 @@ else # ! prebuilt_module_is_dex_javalib
ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
$(built_module) : $(my_prebuilt_src_file) $(built_module) : $(my_prebuilt_src_file)
$(transform-prebuilt-to-target-strip-comments) $(transform-prebuilt-to-target-strip-comments)
ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)
$(hide) chmod +x $@
endif
else ifneq ($(LOCAL_ACP_UNAVAILABLE),true) else ifneq ($(LOCAL_ACP_UNAVAILABLE),true)
$(built_module) : $(my_prebuilt_src_file) | $(ACP) $(built_module) : $(my_prebuilt_src_file) | $(ACP)
$(transform-prebuilt-to-target) $(transform-prebuilt-to-target)
ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)
$(hide) chmod +x $@
endif
else else
$(built_module) : $(my_prebuilt_src_file) $(built_module) : $(my_prebuilt_src_file)
$(copy-file-to-target-with-cp) $(copy-file-to-target-with-cp)
ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)
$(hide) chmod +x $@
endif
endif endif
endif # ! prebuilt_module_is_dex_javalib endif # ! prebuilt_module_is_dex_javalib
endif # LOCAL_MODULE_CLASS != APPS endif # LOCAL_MODULE_CLASS != APPS

17
tools/apicheck/Android.mk
View File

@@ -15,26 +15,15 @@
ifneq ($(TARGET_BUILD_PDK),true) ifneq ($(TARGET_BUILD_PDK),true)
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
# We use copy-file-to-new-target so that the installed
# script file's timestamp is at least as new as the
# .jar file it wraps.
#TODO(dbort): add a template to do this stuff; share with jx
# the hat script # the hat script
# ============================================================ # ============================================================
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_IS_HOST_MODULE := true LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE := apicheck LOCAL_MODULE := apicheck
LOCAL_SRC_FILES := etc/apicheck
include $(BUILD_SYSTEM)/base_rules.mk LOCAL_REQUIRED_MODULES := doclava
include $(BUILD_PREBUILT)
$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX)
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/apicheck | $(ACP)
@echo "Copy: $(PRIVATE_MODULE) ($@)"
$(copy-file-to-new-target)
$(hide) chmod 755 $@
# Apicheck is now part of Doclava -- See external/doclava. # Apicheck is now part of Doclava -- See external/doclava.
endif endif