From f0cf4911fb5d8c02e2cd6fe94823982e9dae8f7e Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Wed, 9 Mar 2016 14:06:07 -0700
Subject: [PATCH] Add `lintOptions abortOnError false` to satisfy F-Droid.

---
 app/app.iml      | 90 +++++++++++++++++++++++++-----------------------
 app/build.gradle | 11 +++++-
 2 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 1bb84f7d..a3768653 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -8,62 +8,62 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="standardDebug" />
+        <option name="SELECTED_BUILD_VARIANT" value="freeDebug" />
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleStandardDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileStandardDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleStandardDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileStandardDebugAndroidTestSources" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleFreeDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileFreeDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleFreeDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileFreeDebugAndroidTestSources" />
         <afterSyncTasks>
-          <task>generateStandardDebugAndroidTestSources</task>
-          <task>generateStandardDebugSources</task>
+          <task>generateFreeDebugAndroidTestSources</task>
+          <task>generateFreeDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/free/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/standard/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/standard/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/free/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/free/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/standard/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/standard/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/standard/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/standard/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/standard/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/standard/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standardDebug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/standard/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/standard/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/standard/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/standard/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/standard/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/standard/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standard/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standard/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standard/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standard/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standard/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standard/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/standard/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestStandard/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/free/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/free/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/free/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/free/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/free/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/free/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/free/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/free/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/free/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/free/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/free/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/free/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/free/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/free/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/free/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/free/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/free/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/free/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/free/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -97,6 +97,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/8.4.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.4.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
@@ -116,8 +118,10 @@
     <orderEntry type="library" exported="" name="support-v4-23.2.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.2.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-basement-8.4.0" level="project" />
     <orderEntry type="library" exported="" name="support-vector-drawable-23.2.0" level="project" />
     <orderEntry type="library" exported="" name="design-23.2.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.2.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-ads-8.4.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 2b6bb828..7d29b94e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 /**
  * Copyright 2016 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser.
+ * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
  * Privacy Browser is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@ apply plugin: 'com.android.application'
 android {
     signingConfigs {
     }
+
     compileSdkVersion 23
     buildToolsVersion "23.0.2"
     defaultConfig {
@@ -31,12 +32,14 @@ android {
         versionCode 1
         versionName "1.0"
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
     productFlavors {
         standard {
             applicationId "com.stoutner.privacybrowser.standard"
@@ -48,6 +51,11 @@ android {
             versionName "1.0-free"
         }
     }
+
+    // `lintOptions abortOnError false` is required for F-Droid to build correctly.
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {
@@ -55,5 +63,6 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.2.0'
     compile 'com.android.support:design:23.2.0'
     compile 'com.android.support:support-v4:23.2.0'
+    // Only compile com.google.android.gms:play-services-ads for the free version so that the standard version can build of F-Droid.
     freeCompile 'com.google.android.gms:play-services-ads:8.4.0'
 }
-- 
2.43.0