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

Commit 08420cbc authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Ensure prebuilt executables are executable 

Use 'chmod +x' to make sure that they're executable, even if the source
file is not.

Change-Id: Id155f6b4ff188f5c909fd6237fd64183af264f79
parent a65b01fc

core/prebuilt_internal.mk

+6 −2
Original line number Diff line number Diff line
@@ -275,13 +275,17 @@ $(my_register_name): $(installed_apk_splits) 
endif # LOCAL_PACKAGE_SPLITS



else # LOCAL_MODULE_CLASS != APPS

ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)



$(built_module) : $(my_prebuilt_src_file)

ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)

	$(transform-prebuilt-to-target-strip-comments)

else

$(built_module) : $(my_prebuilt_src_file)

	$(transform-prebuilt-to-target)

endif

ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)

	$(hide) chmod +x $@

endif



endif # LOCAL_MODULE_CLASS != APPS



ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)

tools/apicheck/Android.mk

+3 −14
Original line number Diff line number Diff line
@@ -15,26 +15,15 @@ 
ifneq ($(TARGET_BUILD_PDK),true)

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

# ============================================================

include $(CLEAR_VARS)

LOCAL_IS_HOST_MODULE := true

LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_MODULE := apicheck



include $(BUILD_SYSTEM)/base_rules.mk



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

LOCAL_SRC_FILES := etc/apicheck

LOCAL_REQUIRED_MODULES := doclava

include $(BUILD_PREBUILT)



# Apicheck is now part of Doclava -- See external/doclava.

endif