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

Commit 546f303a authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge remote-tracking branch 'upstream/master'

parents 5516c49c 4164d357
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
# SPDX-FileCopyrightText: 2013, microG Project Team
# SPDX-License-Identifier: CC0-1.0

*.iml
gen/
bin/

.gitmodules

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line
[submodule "extern/UnifiedNlpApi"]
	path = extern/UnifiedNlpApi
	url = https://gitlab.e.foundation/e/apps/UnifiedNlpApi
	branch = master
[submodule "extern/MicroGUiTools"]
	path = extern/MicroGUiTools
	url = https://gitlab.e.foundation/e/apps/MicroGUITools
	branch = master
+23 −18
Original line number Diff line number Diff line
# SPDX-FileCopyrightText: 2014, microg Project Team
# SPDX-License-Identifier: CC0-1.0

jobs:
  include:
    - name: "Build"
      language: android
sudo: false
before_script:
  - echo sdk.dir $ANDROID_HOME > local.properties
script:
  - jdk_switcher use oraclejdk8
  - export TERM=dumb
  - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
  - ./gradlew build
      android:
        components:
          - tools
  - platform-tools
  - build-tools-27.0.3
  - android-27
  - extra-android-m2repository
before_install:
 - yes | sdkmanager "platforms;android-27"
          - build-tools-29.0.3
          - android-29
      script:
        - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
        - export TERM=dumb
        - echo sdk.dir $ANDROID_HOME > local.properties
        - jdk_switcher use oraclejdk8
        - ./gradlew build
    - name: "REUSE lint"
      language: minimal
      script:
        - docker pull fsfe/reuse:latest
        - docker run -v ${TRAVIS_BUILD_DIR}:/data fsfe/reuse:latest lint

.tx/config

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line
[main]
host = https://www.transifex.com
lang_map = he: iw, zh_TW: zh-rTW, es_MX: es-rMX, pt_BR: pt-rBR

[unifiednlp.strings]
file_filter = unifiednlp-base/src/main/res/values-<lang>/strings.xml
source_file = unifiednlp-base/src/main/res/values/strings.xml
source_lang = en
type = ANDROID

Android.mk

deleted100644 → 0
+0 −86
Original line number Diff line number Diff line
# Copyright (c) 2013-2015 microG Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
appcompat_dir := ../../../frameworks/support/v7/appcompat
uitools_dir := ../../../external/MicroGUiTools
res_dir := unifiednlp-base/src/main/res $(appcompat_dir)/res $(uitools_dir)/microg-ui-tools/src/main/res

##
# NetworkLocation
# Target using com.google.android.gms as package name

# Generate Gradle BuildConfig.mk file since AOSP does not handle that
# Remove the generated file if you want it to be regenerated with new values

UNIFIEDNLP_BUILDCONFIG_CLASS := unifiednlp-base/src/main/java/org/microg/nlp/BuildConfig.java
UNIFIEDNLP_BC_PATH := $(LOCAL_PATH)/$(UNIFIEDNLP_BUILDCONFIG_CLASS)
UNIFIEDNLP_BC_APPLICATION_ID := "org.microg.nlp"
UNIFIEDNLP_BC_VERSION_NAME := "-1"

$(UNIFIEDNLP_BC_PATH):
	echo "/**" > $(UNIFIEDNLP_BC_PATH)
	echo "* Automatically generated file. DO NOT MODIFY" >> $(UNIFIEDNLP_BC_PATH)
	echo "*/" >> $(UNIFIEDNLP_BC_PATH)
	echo "package "$(UNIFIEDNLP_BC_APPLICATION_ID)";" >> $(UNIFIEDNLP_BC_PATH)
	echo "public final class BuildConfig {" >> $(UNIFIEDNLP_BC_PATH)
	echo "    public static final String APPLICATION_ID = \""$(UNIFIEDNLP_BC_APPLICATION_ID)"\";" >> $(UNIFIEDNLP_BC_PATH)
	echo "    public static final String VERSION_NAME = \""$(UNIFIEDNLP_BC_VERSION_NAME)"\";" >> $(UNIFIEDNLP_BC_PATH)
	echo "    private BuildConfig() {}" >> $(UNIFIEDNLP_BC_PATH)
	echo "}" >> $(UNIFIEDNLP_BC_PATH)

LOCAL_MODULE_TAGS := optional

LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
LOCAL_SRC_FILES := $(call all-java-files-under, unifiednlp-app/src/main/java) \
                   $(call all-java-files-under, unifiednlp-base/src/main/java)
LOCAL_SRC_FILES += $(UNIFIEDNLP_BUILDCONFIG_CLASS)

LOCAL_MANIFEST_FILE := unifiednlp-app/src/main/AndroidManifest.xml
LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/unifiednlp-base/src/main/AndroidManifest.xml

LOCAL_JAVA_LIBRARIES := framework com.android.location.provider

# Include compat v9 files if necassary
ifeq ($(shell [ $(PLATFORM_SDK_VERSION) -ge 17 ] && echo true), true)
LOCAL_JAVA_LIBRARIES += UnifiedNlpCompatV9
endif

LOCAL_STATIC_JAVA_LIBRARIES := UnifiedNlpApi MicroGUiTools android-support-v4 android-support-v7-appcompat
LOCAL_PACKAGE_NAME := NetworkLocation
LOCAL_SDK_VERSION := current
LOCAL_PRIVILEGED_MODULE := true

LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_AAPT_FLAGS := --auto-add-overlay \
    --rename-manifest-package com.google.android.gms \
    --extra-packages org.microg.nlp \
    --extra-packages org.microg.tools.ui \
    --extra-packages android.support.v7.appcompat

include $(BUILD_PACKAGE)

##
# UnifiedNlpCompatV9
# Compatibilty files to allow building for API v9 in newer systems

include $(CLEAR_VARS)

LOCAL_MODULE := UnifiedNlpCompatV9
LOCAL_SRC_FILES := $(call all-java-files-under, unifiednlp-compat/src/v9/java)
LOCAL_SRC_FILES += $(call all-Iaidl-files-under, unifiednlp-compat/src/v9/aidl)

include $(BUILD_STATIC_JAVA_LIBRARY)
Loading