mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-01-11 23:49:34 -05:00
Rebase some stuff
This commit is contained in:
parent
186915e7e0
commit
ba6460300a
@ -0,0 +1,437 @@
|
||||
From 3ee3966f3bb2c7cf30e6bf38fd2bbb1b2ece00b3 Mon Sep 17 00:00:00 2001
|
||||
From: Tad <tad@spotco.us>
|
||||
Date: Tue, 17 Jan 2017 18:04:09 -0500
|
||||
Subject: [PATCH] Remove stats
|
||||
|
||||
Change-Id: If22fca4b2b641f8b68247ece20441b5cc7724709
|
||||
---
|
||||
AndroidManifest.xml | 25 -----
|
||||
proguard.flags | 1 -
|
||||
res/values/config.xml | 3 -
|
||||
res/values/strings.xml | 22 -----
|
||||
res/xml/anonymous_stats.xml | 32 -------
|
||||
res/xml/parts_catalog.xml | 5 -
|
||||
res/xml/preview_data.xml | 52 -----------
|
||||
res/xml/privacy_settings.xml | 8 --
|
||||
.../cmparts/cmstats/AnonymousStats.java | 73 ---------------
|
||||
src/org/cyanogenmod/cmparts/cmstats/Utilities.java | 102 ---------------------
|
||||
10 files changed, 323 deletions(-)
|
||||
delete mode 100644 res/xml/anonymous_stats.xml
|
||||
delete mode 100644 res/xml/preview_data.xml
|
||||
delete mode 100644 src/org/cyanogenmod/cmparts/cmstats/AnonymousStats.java
|
||||
delete mode 100644 src/org/cyanogenmod/cmparts/cmstats/Utilities.java
|
||||
|
||||
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
|
||||
index 3c58c3f..914a9df 100644
|
||||
--- a/AndroidManifest.xml
|
||||
+++ b/AndroidManifest.xml
|
||||
@@ -183,31 +183,6 @@
|
||||
android:value="status_bar_settings" />
|
||||
</activity-alias>
|
||||
|
||||
- <!-- Anonymous Statistics -->
|
||||
- <receiver android:name=".cmstats.ReportingServiceManager"
|
||||
- android:enabled="true"
|
||||
- android:exported="false"
|
||||
- android:label="ReportingServiceManager">
|
||||
- <intent-filter>
|
||||
- <action android:name="android.intent.action.BOOT_COMPLETED" />
|
||||
- <action android:name="org.cyanogenmod.cmparts.action.TRIGGER_REPORT_METRICS" />
|
||||
- </intent-filter>
|
||||
- </receiver>
|
||||
-
|
||||
- <service android:label="ReportingService"
|
||||
- android:enabled="true"
|
||||
- android:exported="false"
|
||||
- android:name=".cmstats.ReportingService">
|
||||
- </service>
|
||||
-
|
||||
- <service android:name=".cmstats.StatsUploadJobService"
|
||||
- android:permission="android.permission.BIND_JOB_SERVICE" />
|
||||
-
|
||||
- <service android:name=".cmstats.ReportingService"
|
||||
- android:label="ReportingService"
|
||||
- android:enabled="true"
|
||||
- android:exported="false" />
|
||||
-
|
||||
<!-- Weather settings -->
|
||||
<activity-alias
|
||||
android:name=".weather.WeatherServiceSettings"
|
||||
diff --git a/proguard.flags b/proguard.flags
|
||||
index 733d5d9..58addff 100644
|
||||
--- a/proguard.flags
|
||||
+++ b/proguard.flags
|
||||
@@ -3,7 +3,6 @@
|
||||
-keep class org.cyanogenmod.cmparts.*Picker
|
||||
-keep class org.cyanogenmod.cmparts.*Settings
|
||||
|
||||
--keep class org.cyanogenmod.cmparts.cmstats.*
|
||||
-keep class org.cyanogenmod.cmparts.contributors.*
|
||||
-keep class org.cyanogenmod.cmparts.hardware.*
|
||||
-keep class org.cyanogenmod.cmparts.input.*
|
||||
diff --git a/res/values/config.xml b/res/values/config.xml
|
||||
index 2980816..a5729c6 100644
|
||||
--- a/res/values/config.xml
|
||||
+++ b/res/values/config.xml
|
||||
@@ -17,9 +17,6 @@
|
||||
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
|
||||
- <!-- Metrics server endpoint -->
|
||||
- <string name="stats_cm_url">https://stats.lineageos.org/api/v1/stats</string>
|
||||
-
|
||||
<!-- When true, weather options will be displayed in settings dashboard -->
|
||||
<bool name="config_showWeatherMenu">true</bool>
|
||||
|
||||
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
||||
index c13655e..6891213 100644
|
||||
--- a/res/values/strings.xml
|
||||
+++ b/res/values/strings.xml
|
||||
@@ -482,28 +482,6 @@
|
||||
<b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
|
||||
<b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
|
||||
|
||||
- <!-- Anonymous Statistics #CM -->
|
||||
- <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
|
||||
- <string name="anonymous_statistics_title">LineageOS statistics</string>
|
||||
- <string name="anonymous_statistics_summary">Help make LineageOS better by opting into anonymous statistics reporting</string>
|
||||
- <string name="anonymous_statistics_warning_title">About</string>
|
||||
- <string name="anonymous_statistics_warning">Opting into LineageOS Statistics will allow non-personal data to be submitted to the
|
||||
- developers of LineageOS to track unique installations across devices. The information submitted includes an unique identifier,
|
||||
- which does not compromise your privacy or personal data. The data is submitted during each boot.\n\nFor an example of the data that is submitted, tap on Preview Data.</string>
|
||||
- <string name="enable_reporting_title">Enable reporting</string>
|
||||
- <string name="preview_data_title">Preview data</string>
|
||||
- <string name="view_stats_title">View stats</string>
|
||||
- <string name="anonymous_learn_more">Learn more</string>
|
||||
-
|
||||
- <!-- Anonymous Statistics - Preview -->
|
||||
- <string name="preview_id_title">Unique ID</string>
|
||||
- <string name="preview_device_title">Device</string>
|
||||
- <string name="preview_version_title">Version</string>
|
||||
- <string name="preview_country_title">Country</string>
|
||||
- <string name="preview_carrier_title">Carrier</string>
|
||||
- <string name="stats_collection_title">Stats collection</string>
|
||||
- <string name="stats_collection_summary">Allow installation metrics and device statistics to be collected</string>
|
||||
-
|
||||
<!-- Display : Rotation -->
|
||||
<string name="accelerometer_title">Auto-rotate screen</string>
|
||||
<string name="display_rotation_title">Rotation settings</string>
|
||||
diff --git a/res/xml/anonymous_stats.xml b/res/xml/anonymous_stats.xml
|
||||
deleted file mode 100644
|
||||
index b29885c..0000000
|
||||
--- a/res/xml/anonymous_stats.xml
|
||||
+++ /dev/null
|
||||
@@ -1,32 +0,0 @@
|
||||
-<?xml version="1.0" encoding="utf-8"?>
|
||||
-<!-- Copyright (C) 2012 The CyanogenMod 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.
|
||||
--->
|
||||
-
|
||||
-<PreferenceScreen
|
||||
- xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
- android:key="cmstats"
|
||||
- android:title="@string/anonymous_statistics_title">
|
||||
-
|
||||
- <cyanogenmod.preference.CMSecureSettingSwitchPreference
|
||||
- android:key="stats_collection"
|
||||
- android:title="@string/stats_collection_title"
|
||||
- android:summary="@string/stats_collection_summary"
|
||||
- android:defaultValue="true" />
|
||||
-
|
||||
- <PreferenceScreen
|
||||
- android:title="@string/preview_data_title"
|
||||
- android:fragment="org.cyanogenmod.cmparts.cmstats.PreviewData" />
|
||||
-
|
||||
-</PreferenceScreen>
|
||||
diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
|
||||
index 71328eb..347f8e2 100644
|
||||
--- a/res/xml/parts_catalog.xml
|
||||
+++ b/res/xml/parts_catalog.xml
|
||||
@@ -74,11 +74,6 @@
|
||||
android:fragment="org.cyanogenmod.cmparts.statusbar.StatusBarSettings"
|
||||
cm:xmlRes="@xml/status_bar_settings" />
|
||||
|
||||
- <part android:key="cmstats"
|
||||
- android:title="@string/anonymous_statistics_title"
|
||||
- android:fragment="org.cyanogenmod.cmparts.cmstats.AnonymousStats"
|
||||
- cm:xmlRes="@xml/anonymous_stats" />
|
||||
-
|
||||
<part android:key="power_menu"
|
||||
android:title="@string/power_menu_title"
|
||||
android:fragment="org.cyanogenmod.cmparts.input.PowerMenuActions"
|
||||
diff --git a/res/xml/preview_data.xml b/res/xml/preview_data.xml
|
||||
deleted file mode 100644
|
||||
index 025524c..0000000
|
||||
--- a/res/xml/preview_data.xml
|
||||
+++ /dev/null
|
||||
@@ -1,52 +0,0 @@
|
||||
-<?xml version="1.0" encoding="utf-8"?>
|
||||
-<!-- Copyright (C) 2012 The CyanogenMod 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.
|
||||
--->
|
||||
-
|
||||
-<PreferenceScreen
|
||||
- xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
- android:title="@string/preview_data_title">
|
||||
-
|
||||
- <Preference
|
||||
- android:key="preview_id"
|
||||
- style="?android:preferenceInformationStyle"
|
||||
- android:title="@string/preview_id_title"
|
||||
- android:summary="%s" />
|
||||
-
|
||||
- <Preference
|
||||
- android:key="preview_device"
|
||||
- style="?android:preferenceInformationStyle"
|
||||
- android:title="@string/preview_device_title"
|
||||
- android:summary="%s" />
|
||||
-
|
||||
- <Preference
|
||||
- android:key="preview_version"
|
||||
- style="?android:preferenceInformationStyle"
|
||||
- android:title="@string/preview_version_title"
|
||||
- android:summary="%s" />
|
||||
-
|
||||
- <Preference
|
||||
- android:key="preview_country"
|
||||
- style="?android:preferenceInformationStyle"
|
||||
- android:title="@string/preview_country_title"
|
||||
- android:summary="%s" />
|
||||
-
|
||||
- <Preference
|
||||
- android:key="preview_carrier"
|
||||
- style="?android:preferenceInformationStyle"
|
||||
- android:title="@string/preview_carrier_title"
|
||||
- android:summary="%s" />
|
||||
-
|
||||
-</PreferenceScreen>
|
||||
-
|
||||
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
|
||||
index 5ae923a..45df2a1 100644
|
||||
--- a/res/xml/privacy_settings.xml
|
||||
+++ b/res/xml/privacy_settings.xml
|
||||
@@ -36,12 +36,4 @@
|
||||
android:targetClass="com.android.settings.applications.ProtectedAppsActivity" />
|
||||
</Preference>
|
||||
|
||||
- <!-- Anonymous statistics - (CMStats) -->
|
||||
- <PreferenceScreen
|
||||
- android:key="cmstats"
|
||||
- android:title="@string/anonymous_statistics_title"
|
||||
- android:summary="@string/anonymous_statistics_summary"
|
||||
- android:fragment="org.cyanogenmod.cmparts.cmstats.AnonymousStats" >
|
||||
- </PreferenceScreen>
|
||||
-
|
||||
</PreferenceScreen>
|
||||
diff --git a/src/org/cyanogenmod/cmparts/cmstats/AnonymousStats.java b/src/org/cyanogenmod/cmparts/cmstats/AnonymousStats.java
|
||||
deleted file mode 100644
|
||||
index 3a6669d..0000000
|
||||
--- a/src/org/cyanogenmod/cmparts/cmstats/AnonymousStats.java
|
||||
+++ /dev/null
|
||||
@@ -1,73 +0,0 @@
|
||||
-/*
|
||||
- * Copyright (C) 2015 The CyanogenMod 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.
|
||||
- */
|
||||
-
|
||||
-package org.cyanogenmod.cmparts.cmstats;
|
||||
-
|
||||
-import android.content.Context;
|
||||
-import android.content.SharedPreferences;
|
||||
-import android.os.Bundle;
|
||||
-
|
||||
-import org.cyanogenmod.cmparts.R;
|
||||
-import org.cyanogenmod.cmparts.SettingsPreferenceFragment;
|
||||
-
|
||||
-public class AnonymousStats extends SettingsPreferenceFragment {
|
||||
-
|
||||
- private static final String PREF_FILE_NAME = "CMStats";
|
||||
- /* package */ static final String ANONYMOUS_OPT_IN = "pref_anonymous_opt_in";
|
||||
- /* package */ static final String ANONYMOUS_LAST_CHECKED = "pref_anonymous_checked_in";
|
||||
-
|
||||
- /* package */ static final String KEY_LAST_JOB_ID = "last_job_id";
|
||||
- /* package */ static final int QUEUE_MAX_THRESHOLD = 1000;
|
||||
-
|
||||
- public static SharedPreferences getPreferences(Context context) {
|
||||
- return context.getSharedPreferences(PREF_FILE_NAME, 0);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void onCreate(Bundle savedInstanceState) {
|
||||
- super.onCreate(savedInstanceState);
|
||||
- addPreferencesFromResource(R.xml.anonymous_stats);
|
||||
- }
|
||||
-
|
||||
- public static void updateLastSynced(Context context) {
|
||||
- getPreferences(context)
|
||||
- .edit()
|
||||
- .putLong(ANONYMOUS_LAST_CHECKED,System.currentTimeMillis())
|
||||
- .commit();
|
||||
- }
|
||||
-
|
||||
- private static int getLastJobId(Context context) {
|
||||
- return getPreferences(context).getInt(KEY_LAST_JOB_ID, 0);
|
||||
- }
|
||||
-
|
||||
- private static void setLastJobId(Context context, int id) {
|
||||
- getPreferences(context)
|
||||
- .edit()
|
||||
- .putInt(KEY_LAST_JOB_ID, id)
|
||||
- .commit();
|
||||
- }
|
||||
-
|
||||
- public static int getNextJobId(Context context) {
|
||||
- int lastId = getLastJobId(context);
|
||||
- if (lastId >= QUEUE_MAX_THRESHOLD) {
|
||||
- lastId = 1;
|
||||
- } else {
|
||||
- lastId += 1;
|
||||
- }
|
||||
- setLastJobId(context, lastId);
|
||||
- return lastId;
|
||||
- }
|
||||
-}
|
||||
diff --git a/src/org/cyanogenmod/cmparts/cmstats/Utilities.java b/src/org/cyanogenmod/cmparts/cmstats/Utilities.java
|
||||
deleted file mode 100644
|
||||
index efb7379..0000000
|
||||
--- a/src/org/cyanogenmod/cmparts/cmstats/Utilities.java
|
||||
+++ /dev/null
|
||||
@@ -1,102 +0,0 @@
|
||||
-/*
|
||||
- * Copyright (C) 2012 The CyanogenMod 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.
|
||||
- */
|
||||
-
|
||||
-package org.cyanogenmod.cmparts.cmstats;
|
||||
-
|
||||
-import android.content.Context;
|
||||
-import android.os.Build;
|
||||
-import android.os.SystemProperties;
|
||||
-import android.provider.Settings;
|
||||
-import android.telephony.TelephonyManager;
|
||||
-import android.text.TextUtils;
|
||||
-
|
||||
-import cyanogenmod.providers.CMSettings;
|
||||
-
|
||||
-import java.math.BigInteger;
|
||||
-import java.net.NetworkInterface;
|
||||
-import java.security.MessageDigest;
|
||||
-
|
||||
-public class Utilities {
|
||||
- public static String getUniqueID(Context context) {
|
||||
- final String id = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
|
||||
- return digest(context.getPackageName() + id);
|
||||
- }
|
||||
-
|
||||
- public static String getCarrier(Context context) {
|
||||
- TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||
- String carrier = tm.getNetworkOperatorName();
|
||||
- if (TextUtils.isEmpty(carrier)) {
|
||||
- carrier = "Unknown";
|
||||
- }
|
||||
- return carrier;
|
||||
- }
|
||||
-
|
||||
- public static String getCarrierId(Context context) {
|
||||
- TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||
- String carrierId = tm.getNetworkOperator();
|
||||
- if (TextUtils.isEmpty(carrierId)) {
|
||||
- carrierId = "0";
|
||||
- }
|
||||
- return carrierId;
|
||||
- }
|
||||
-
|
||||
- public static String getCountryCode(Context context) {
|
||||
- TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||
- String countryCode = tm.getNetworkCountryIso();
|
||||
- if (TextUtils.isEmpty(countryCode)) {
|
||||
- countryCode = "Unknown";
|
||||
- }
|
||||
- return countryCode;
|
||||
- }
|
||||
-
|
||||
- public static String getDevice() {
|
||||
- return SystemProperties.get("ro.cm.device", Build.PRODUCT);
|
||||
- }
|
||||
-
|
||||
- public static String getModVersion() {
|
||||
- return SystemProperties.get("ro.cm.version", Build.DISPLAY);
|
||||
- }
|
||||
-
|
||||
- public static String digest(String input) {
|
||||
- try {
|
||||
- MessageDigest md = MessageDigest.getInstance("SHA-256");
|
||||
- return new BigInteger(1, md.digest(input.getBytes())).toString(16).toUpperCase();
|
||||
- } catch (Exception e) {
|
||||
- return null;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
- * Check to see if global stats are enabled.
|
||||
- * @param context
|
||||
- * @return Whether or not stats collection is enabled.
|
||||
- */
|
||||
- public static boolean isStatsCollectionEnabled(Context context) {
|
||||
- return CMSettings.Secure.getInt(context.getContentResolver(),
|
||||
- CMSettings.Secure.STATS_COLLECTION, 1) != 0;
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
- * Enabled or disable stats collection
|
||||
- * @param context
|
||||
- * @param enabled Boolean that sets collection being enabled.
|
||||
- */
|
||||
- public static void setStatsCollectionEnabled(Context context, boolean enabled) {
|
||||
- int enable = (enabled) ? 1 : 0;
|
||||
- CMSettings.Secure.putInt(context.getContentResolver(),
|
||||
- CMSettings.Secure.STATS_COLLECTION, enable);
|
||||
- }
|
||||
-}
|
||||
--
|
||||
2.9.3
|
||||
|
@ -1,16 +1,15 @@
|
||||
From 98f96597bc7ac50a9a1968f57921c751585977c3 Mon Sep 17 00:00:00 2001
|
||||
From 58a843a4197360a4522290897571017469eec6fa Mon Sep 17 00:00:00 2001
|
||||
From: Tad <tad@spotco.us>
|
||||
Date: Sun, 18 Dec 2016 16:53:19 -0500
|
||||
Date: Wed, 8 Feb 2017 14:48:17 -0500
|
||||
Subject: [PATCH] Build fixes
|
||||
|
||||
Change-Id: Icfae5b47655f9e1a8dceb48f2f4ab08c6bbe5001
|
||||
Change-Id: I227db20b7e0bdee8e13decf3ef3c51c17627973a
|
||||
---
|
||||
Android.mk | 4 ++--
|
||||
build.gradle | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
Android.mk | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Android.mk b/Android.mk
|
||||
index 516e72b..bfb2794 100644
|
||||
index ddd5608..35414f3 100644
|
||||
--- a/Android.mk
|
||||
+++ b/Android.mk
|
||||
@@ -21,14 +21,14 @@ LOCAL_PACKAGE_NAME := GmsCore
|
||||
@ -24,25 +23,12 @@ index 516e72b..bfb2794 100644
|
||||
|
||||
$(gmscore_root)/$(gmscore_dir)/$(gmscore_apk):
|
||||
rm -Rf $(gmscore_build)
|
||||
mkdir -p $(gmscore_out)
|
||||
- ln -s $(gmscore_out) $(gmscore_build)
|
||||
+ ln -sf $(gmscore_out) $(gmscore_build)
|
||||
mkdir -p $(ANDROID_BUILD_TOP)/$(gmscore_out)
|
||||
- ln -s $(ANDROID_BUILD_TOP)/$(gmscore_out) $(ANDROID_BUILD_TOP)/$(gmscore_build)
|
||||
+ ln -sf $(ANDROID_BUILD_TOP)/$(gmscore_out) $(ANDROID_BUILD_TOP)/$(gmscore_build)
|
||||
echo "sdk.dir=$(ANDROID_HOME)" > $(gmscore_root)/local.properties
|
||||
cd $(gmscore_root) && git submodule update --recursive --init
|
||||
cd $(gmscore_root)/$(gmscore_dir) && JAVA_TOOL_OPTIONS="$(JAVA_TOOL_OPTIONS) -Dfile.encoding=UTF8" ../gradlew assembleRelease
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index 3ec4bfc..8a7d2e2 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -26,7 +26,7 @@ buildscript {
|
||||
|
||||
allprojects {
|
||||
apply plugin: 'idea'
|
||||
- ext.androidBuildVersionTools = "24.0.3"
|
||||
+ ext.androidBuildVersionTools = "25.0.1"
|
||||
ext.isReleaseVersion = false
|
||||
}
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
@ -55,6 +55,7 @@ deblob() {
|
||||
blobs=$blobs"|com.google.widevine.software.drm.jar|com.google.widevine.software.drm.xml|libdrmwvmplugin.so|libwvdrmengine.so|libwvdrm_L1.so|libwvdrm_L3.so|libwvm.so|libWVphoneAPI.so|libWVStreamControlAPI_L1.so|libWVStreamControlAPI_L3.so|widevine.b00|widevine.b01|widevine.b02|widevine.b03|widevine.mdt";
|
||||
#grep -v "WV_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(WV_IMAGES)))" Android.mk >> Android.mk.new; #FIXME: Figure out a way to do this
|
||||
#mv Android.mk.new Android.mk;
|
||||
rm -rf libshimwvm; #Remove the compatibility module
|
||||
|
||||
#GPS XXX: Breaks GPS
|
||||
#blobs=$blobs"|flp.conf|flp.default.so|flp.msm8084.so|flp.msm8960.so|gpsd|gps.msm8084.so|gps.msm8960.so|libflp.so|libgps.utils.so|libloc_api_v02.so|libloc_core.so|libloc_ds_api.so|libloc_eng.so|libloc_ext.so";
|
||||
|
@ -91,23 +91,22 @@ rm app/src/main/res/xml/preferences.xml.orig
|
||||
enter "packages/apps/FDroidPrivilegedExtension"
|
||||
patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0001-Update_Build_Tools.patch" #Update build tools
|
||||
patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0002-Release_Key.patch" #Change to release key
|
||||
patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0003-Test_Keys.patch" #Add test-keys XXX: ONLY USE FOR TEST BUILDS
|
||||
#patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0003-Test_Keys.patch" #Add test-keys XXX: ONLY USE FOR TEST BUILDS
|
||||
#release-keys: CB:1E:E2:EC:40:D0:5E:D6:78:F4:2A:E7:01:CD:FA:29:EE:A7:9D:0E:6D:63:32:76:DE:23:0B:F3:49:40:67:C3
|
||||
#test-keys: C8:A2:E9:BC:CF:59:7C:2F:B6:DC:66:BE:E2:93:FC:13:F2:FC:47:EC:77:BC:6B:2B:0D:52:C1:1F:51:19:2A:B8
|
||||
|
||||
enter "vendor/cmsdk"
|
||||
git fetch https://review.lineageos.org/LineageOS/cm_platform_sdk refs/changes/21/148321/5 && git cherry-pick FETCH_HEAD #Network Traffic
|
||||
git fetch https://review.lineageos.org/LineageOS/cm_platform_sdk refs/changes/21/148321/7 && git cherry-pick FETCH_HEAD #Network Traffic
|
||||
|
||||
enter "vendor/cm"
|
||||
git fetch https://review.lineageos.org/LineageOS/android_vendor_cm refs/changes/01/156601/8 && git cherry-pick FETCH_HEAD #CustomTiles
|
||||
rm -rf gello #Gello is built out-of-tree and bundles Google Play Services library
|
||||
patch -p1 < $patches"android_vendor_cm/0001-SCE.patch" #Include our extras such as MicroG and F-Droid
|
||||
cp $patches"android_vendor_cm/sce.mk" config/sce.mk
|
||||
|
||||
enter "packages/apps/CMParts"
|
||||
git revert 311172074c5e18e39d88d34db0b9dd6532317811 #TODO: Rebase
|
||||
git fetch https://review.lineageos.org/LineageOS/android_packages_apps_CMParts refs/changes/15/113415/12 && git cherry-pick FETCH_HEAD #Network Traffic
|
||||
patch -p1 < $patches"android_packages_apps_CMParts/0001-Remove_Analytics.patch" #Remove analytics
|
||||
git fetch https://review.lineageos.org/LineageOS/android_packages_apps_CMParts refs/changes/15/113415/15 && git cherry-pick FETCH_HEAD #Network Traffic
|
||||
rm -rf src/org/cyanogenmod/cmparts/cmstats/ #Nuke part of CMStats
|
||||
patch -p1 < $patches"android_packages_apps_CMParts/0001-Remove_Analytics_Partial.patch" #Remove the rest of CMStats
|
||||
rm res/xml/parts_catalog.xml.orig res/values/strings.xml.orig
|
||||
|
||||
enter "packages/apps/SetupWizard"
|
||||
@ -115,8 +114,7 @@ patch -p1 < $patches"android_packages_apps_SetupWizard/0001-Remove_Analytics.pat
|
||||
patch -p1 < $patches"android_packages_apps_SetupWizard/0002-No_GMS.patch" #Disable GMS page
|
||||
|
||||
enter "frameworks/base"
|
||||
#git fetch https://review.lineageos.org/LineageOS/android_frameworks_base refs/changes/11/154011/2 && git cherry-pick FETCH_HEAD #Pixel Colors
|
||||
git fetch https://review.lineageos.org/LineageOS/android_frameworks_base refs/changes/75/151975/11 && git cherry-pick FETCH_HEAD #Network Traffic
|
||||
git fetch https://review.lineageos.org/LineageOS/android_frameworks_base refs/changes/75/151975/17 && git cherry-pick FETCH_HEAD #Network Traffic
|
||||
git revert 2aaa0472da8d254da1f07aa65a664012b52410f4 #re-enable doze on devices without gms
|
||||
#patch -p1 < $patches"android_frameworks_base/0002-Failed_Unlock_Shutdown.patch" #Shutdown after five failed unlock attempts FIXME: Update shutdown() to match new args
|
||||
patch -p1 < $patches"android_frameworks_base/0003-Signature_Spoofing.patch" #Allow packages to spoof their signature (MicroG)
|
||||
@ -131,6 +129,7 @@ rm core/res/res/values/config.xml.orig core/res/res/values/strings.xml.orig core
|
||||
#START OF DEVICE CHANGES
|
||||
#
|
||||
enter "device/motorola/clark"
|
||||
git fetch https://review.lineageos.org/LineageOS/android_device_motorola_clark refs/changes/99/160699/1 && git cherry-pick FETCH_HEAD #selinux
|
||||
patch -p1 < $patches"android_device_motorola_clark/0003-Enable_Dex_Preopt.patch" #Force enables dex pre-optimization
|
||||
patch -p1 < $patches"android_device_motorola_clark/0004-Remove_Widevine.patch" #Removes Google Widevine and disables the DRM server
|
||||
#patch -p1 < $patches"android_device_motorola_clark/0005-TWRP.patch" #Add TWRP support
|
||||
|
Loading…
Reference in New Issue
Block a user