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

Merge "Ensure prebuilt executables are executable"

Browse Source
This commit is contained in:
Dan Willemsen
2016-03-02 18:12:06 +00:00
committed by Gerrit Code Review
parent 6a9d0f9718 08420cbc8a
commit c92dc59c86
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/prebuilt_internal.mk
View File

@@ -275,13 +275,17 @@ $(my_register_name): $(installed_apk_splits)
endif # LOCAL_PACKAGE_SPLITS endif # LOCAL_PACKAGE_SPLITS
else # LOCAL_MODULE_CLASS != APPS else # LOCAL_MODULE_CLASS != APPS
ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
$(built_module) : $(my_prebuilt_src_file) $(built_module) : $(my_prebuilt_src_file)
ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
$(transform-prebuilt-to-target-strip-comments) $(transform-prebuilt-to-target-strip-comments)
else else
$(built_module) : $(my_prebuilt_src_file)
$(transform-prebuilt-to-target) $(transform-prebuilt-to-target)
endif endif
ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)
$(hide) chmod +x $@
endif
endif # LOCAL_MODULE_CLASS != APPS endif # LOCAL_MODULE_CLASS != APPS
ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)

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
@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