Bug 29313: Create TBB Project for tor-android-service

#!/bin/bash

[% c("var/set_default_env") -%]

output_dir=[% dest_dir %]/[% c('filename') %]

gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %]

export GRADLE_MAVEN_REPO="file://$gradle_repo"

# The download script assumes artifact package name is the complete URL path.

# In some cases this is incorrect, so copy those artifacts to correct location

cp -r $gradle_repo/dl/android/maven2/* $gradle_repo

mkdir -p /var/tmp/build $output_dir

[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]

tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz

# Patch projects

cd /var/tmp/build/[% project %]-[% c('version') %]

patch -p1 < $rootdir/gradle.patch

patch -p1 < $rootdir/content-provider.patch

patch -p1 < $rootdir/require-api.patch

# Remove native files, otherwise build will fail after gradle.patch

rm -fR service/src/main/jni

# Replace libraries with the config dependencies

rm service/libs/*

cp $rootdir/[% c('input_files_by_name/topl') %]/*{.aar,.jar} service/libs/

# Build Android Libraries and Apps

$GRADLE_HOME/gradle-4.1/bin/gradle --offline -P androidplugin=3.0.1 -P appcompatVersion=23.4.0 -P compileVersion=26 -P targetVersion=26 -P minVersion=16 assembleRelease -x lint

# Package

cp jsocksAndroid/build/outputs/aar/* service/build/outputs/aar/* $output_dir

# vim: filetype=yaml sw=2

version: '[% c("abbrev") %]'

filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'

git_hash: 6a9314aff4418a4edac33ff39fae266b097cf000

git_url: https://github.com/sisbell/tor-android-service.git

git_submodule: 1

var:

  deps:

    - build-essential

  container:

    use_container: 1

  # this should be updated when the list of gradle dependencies is changed

  gradle_dependencies_version: 1

targets:

  android:

    var:

      arch_deps:

        - openjdk-8-jdk

input_files:

  - project: container-image

  - name: '[% c("var/compiler") %]'

    project: '[% c("var/compiler") %]'

  - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'

    name: gradle-dependencies

    exec: '[% INCLUDE "fetch-gradle-dependencies" %]'

  - filename: gradle.patch

  - filename: content-provider.patch

  - filename: require-api.patch

  - project: tor-onion-proxy-library

    name: topl

diff --git a/service/src/main/java/org/torproject/android/service/DataService.java b/service/src/main/java/org/torproject/android/service/DataService.java

index 8f802ea..07e52f3 100644

--- a/service/src/main/java/org/torproject/android/service/DataService.java

+++ b/service/src/main/java/org/torproject/android/service/DataService.java

@@ -28,7 +28,7 @@ final class DataService {

         this.torService = torService;

         this.eventBroadcaster = eventBroadcaster;

         this.torConfig = torConfig;

-        String packageName = context.getApplicationInfo().packageName;

+        String packageName = "org.torproject.torbrowser";

         COOKIE_CONTENT_URI = Uri.parse("content://" + packageName + ".ui.hiddenservices.providers.cookie/cookie");

         HS_CONTENT_URI = Uri.parse("content://" + packageName + ".ui.hiddenservices.providers/hs");

     }

diff --git a/build.gradle b/build.gradle

index 178278e..d80d0b5 100644

--- a/build.gradle

+++ b/build.gradle

@@ -4,6 +4,7 @@ buildscript {

     repositories {

         google()

         jcenter()

+        maven { url System.getenv("GRADLE_MAVEN_REPO") }

     }

     dependencies {

         classpath "com.android.tools.build:gradle:${androidplugin}"

@@ -19,6 +20,7 @@ allprojects {

         jcenter()

         maven { url "https://jitpack.io" }

         maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }

+        maven { url System.getenv("GRADLE_MAVEN_REPO") }

     }

 }

diff --git a/service/build.gradle b/service/build.gradle

index b414557..f57d9b3 100644

--- a/service/build.gradle

+++ b/service/build.gradle

@@ -16,13 +16,6 @@ android {

         }

     }

-    externalNativeBuild {

-        ndkBuild {

-            path "src/main/jni/Android.mk"

-            buildStagingDirectory "./outputs/ndk-build"

-        }

-    }

-

     lintOptions {

         abortOnError false

     }