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

# Ignore the samples directory, since they should be separate git projects

samples/

e-ui-sdk.jar

 No newline at end of file

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

#!/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

LOCAL_AAPT_FLAGS := --auto-add-overlay

LOCAL_AAPT_FLAGS += --private-symbols org.lineageos.platform.internal

LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res)

LOCAL_RESOURCE_DIR += $(addprefix $(LOCAL_PATH)/, res-symbol)

LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../../sdk/res/res

# Tell aapt to create "extending (non-application)" resource IDs,