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

Commit f802edef authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'e-ui-sdk-q' into 'v1-q' 

/e/ UI SDK Implementation for Q

See merge request !13
parents beba6bb1 087bb13d

.gitignore

+1 −0
Original line number Diff line number Diff line 
# Ignore the samples directory, since they should be separate git projects

samples/

e-ui-sdk.jar
 
 No newline at end of file

.gitlab-ci.yml

+14 −0
Original line number Diff line number Diff line 
stages:

  - update-from-upstream

  - build-sdk



include:

  - project: 'e/priv/os/build'

    ref: master

    file: '/templates/.gitlab-ci-update-from-upstream.yml'



image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest"



before_script:

- chmod a+x buildSdk.sh



build-sdk:

  stage: build-sdk

  script:

  - ./buildSdk.sh

  artifacts:

    paths:

    - e-ui-sdk.jar
 
 No newline at end of file

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ android_app { 


    resource_dirs: [

        "lineage/res/res",

        "sdk/res/res",

        "lineage/res/res-symbol",

        "sdk/res/res"

    ],



    // Create package-export.apk, which other packages can use to get

Android.mk

+26 −0
Original line number Diff line number Diff line
@@ -59,6 +59,32 @@ LOCAL_JAR_EXCLUDE_FILES := none 


LOCAL_STATIC_JAVA_LIBRARIES := org.lineageos.platform.sdk



include $(BUILD_STATIC_JAVA_LIBRARY)

$(LOCAL_MODULE) : $(built_aar)



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



# e sdk

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

include $(CLEAR_VARS)



LOCAL_MODULE := e-sdk.aar



LOCAL_JACK_ENABLED := disabled



LOCAL_CONSUMER_PROGUARD_FILE := $(LOCAL_PATH)/sdk/proguard.txt



LOCAL_RESOURCE_DIR += $(addprefix $(LOCAL_PATH)/, lineage/res/res)

LOCAL_MANIFEST_FILE := lineage/res/AndroidManifest.xml



lineage_sdk_exclude_files := 'lineageos/'

LOCAL_JAR_EXCLUDE_PACKAGES := $(lineage_sdk_exclude_files)

LOCAL_JAR_EXCLUDE_FILES := none



LOCAL_JAVA_LIBRARIES := \

    $(lineage_sdk_LOCAL_JAVA_LIBRARIES)





include $(BUILD_STATIC_JAVA_LIBRARY)

$(LOCAL_MODULE) : $(built_aar)

buildSdk.sh

0 → 100755
+46 −0
Original line number Diff line number Diff line 
#!/bin/bash



echo "Clearing intermediates"

rm -rf intermediates

mkdir intermediates



if [[ -z "${ANDROID_HOME}" ]]; then

	echo "{ANDROID_HOME} path variable is not set. Set it to point Android SDK."

	exit 1

else

	build_tools_dir=$ANDROID_HOME/build-tools/29.0.2/

fi



aapt2="${build_tools_dir}/aapt2"



echo "Compiling resources"

$aapt2 compile --dir lineage/res/res -o intermediates/resources.zip



platform_dir=$ANDROID_HOME/platforms/android-28



echo "Linking resources"

$aapt2 link intermediates/resources.zip -I $platform_dir/android.jar \

 --private-symbols org.lineageos.platform.internal \

 --allow-reserved-package-id \

 --package-id 63 \

 --manifest lineage/res/AndroidManifest.xml \

 --java intermediates \

 -o intermediates/res.apk



echo "Unzipping temporary apk"

unzip -qo intermediates/res.apk -d intermediates/



# Creating obj directory

rm -rf obj

mkdir obj



# Compiling R.java

echo "Compiling R.java"

javac -source 1.8 -target 1.8 $(find intermediates/lineageos -type f -name 'R.java') -d obj



jar cvf e-ui-sdk.jar -C obj . -C intermediates resources.arsc



echo "Clearing intermediate sources"

rm -rf intermediates

rm -rf obj

echo "e-ui-sdk.jar generated successully."
 
 No newline at end of file