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

Commit c5db18ce authored by Tim Schumacher's avatar Tim Schumacher
Browse files

Install the Terminal by using the BUILD_PREBUILT target 

Previously (when the APK was simply copied over) the build
system didn't know what to do with it when it came to
signing.

Change-Id: Ib4e4c8b94d3f84ecde520f0388582852503d99f5
parent 0e074f9b

.gitignore

+1 −1
Original line number Diff line number Diff line 
proprietary/*
 
terminal/proprietary/*
 
 No newline at end of file

config/common.mk

+2 −4
Original line number Diff line number Diff line
@@ -188,10 +188,8 @@ PRODUCT_PACKAGES += \ 
    su



# Terminal Emulator

PRODUCT_COPY_FILES +=  \

    vendor/cm/proprietary/Term.apk:system/app/Term.apk \

    vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm5.so:system/lib/libjackpal-androidterm5.so \

    vendor/cm/proprietary/lib/armeabi/libjackpal-termexec2.so:system/lib/libjackpal-termexec2.so

PRODUCT_PACKAGES += \

    Terminal



PRODUCT_PROPERTY_OVERRIDES += \

    persist.sys.root_access=1

get-prebuilts

+1 −9
Original line number Diff line number Diff line 


BASEDIR=`dirname $0`



mkdir -p $BASEDIR/proprietary



# Get Terminal Emulator for Android (we use a prebuilt so it can update from Play Store)

curl -L -o $BASEDIR/proprietary/Term.apk -O -L https://jackpal.github.com/Android-Terminal-Emulator/downloads/Term.apk

unzip -o -d $BASEDIR/proprietary $BASEDIR/proprietary/Term.apk lib/*

echo "This script isn't needed anymore, because downloading the Terminal Emulator has been moved to an Android.mk file."
 
 No newline at end of file

terminal/Android.mk

0 → 100644
+46 −0
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



$(LOCAL_PATH)/proprietary:

	mkdir -p $(LOCAL_PATH)/proprietary



$(LOCAL_PATH)/proprietary/Term.apk: $(LOCAL_PATH)/proprietary

	curl -L -o $(LOCAL_PATH)/proprietary/Term.apk -O -L https://jackpal.github.com/Android-Terminal-Emulator/downloads/Term.apk



$(LOCAL_PATH)/proprietary/lib/armeabi/%.so: $(LOCAL_PATH)/proprietary/Term.apk

	unzip -o -d $(LOCAL_PATH)/proprietary $(LOCAL_PATH)/proprietary/Term.apk lib/armeabi/$(@F)



include $(CLEAR_VARS)



LOCAL_MODULE := Terminal

LOCAL_SRC_FILES := proprietary/Term.apk

LOCAL_CERTIFICATE := PRESIGNED

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := APPS

LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)

LOCAL_REQUIRED_MODULES := libjackpal-termexec2 libjackpal-androidterm5



include $(BUILD_PREBUILT)





include $(CLEAR_VARS)



LOCAL_MODULE := libjackpal-termexec2

LOCAL_MODULE_SUFFIX := .so

LOCAL_MODULE_CLASS := SHARED_LIBRARIES

LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)

LOCAL_SRC_FILES := proprietary/lib/armeabi/libjackpal-termexec2.so

LOCAL_MODULE_TAGS := optional



include $(BUILD_PREBUILT)





include $(CLEAR_VARS)



LOCAL_MODULE := libjackpal-androidterm5

LOCAL_MODULE_SUFFIX := .so

LOCAL_MODULE_CLASS := SHARED_LIBRARIES

LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)

LOCAL_SRC_FILES := proprietary/lib/armeabi/libjackpal-androidterm5.so

LOCAL_MODULE_TAGS := optional



include $(BUILD_PREBUILT)
 
 No newline at end of file