Merge branch 'muzei' into 'master'
Muzei: exclude example-watchface See merge request !2209
This commit is contained in:
commit
ecafbaf218
|
@ -43,14 +43,14 @@ Build:2.3,23015
|
|||
subdir=main
|
||||
patch=2.3-remove-play-services.patch
|
||||
gradle=prod
|
||||
rm=wearable
|
||||
rm=wearable,example-watchface
|
||||
|
||||
Maintainer Notes:
|
||||
Custom version format, so no UCM applies.
|
||||
|
||||
Since 2.0, source code needs to be patched to get rid of Google Play Services.
|
||||
The wearable component has to be removed completely, the rest of the code must
|
||||
be cleaned up from FirebaseAnalytics.
|
||||
The wearable and example-watchface components should be removed completely, the
|
||||
rest of the code has be cleaned up from FirebaseAnalytics.
|
||||
.
|
||||
|
||||
Auto Update Mode:None
|
||||
|
|
|
@ -556,9 +556,9 @@ index fea6abc..0000000
|
|||
- }
|
||||
-}
|
||||
diff --git a/settings.gradle b/settings.gradle
|
||||
index 1650621..675275e 100644
|
||||
index 1650621..26d06ce 100644
|
||||
--- a/settings.gradle
|
||||
+++ b/settings.gradle
|
||||
@@ -1 +1 @@
|
||||
-include ':api', ':android-client-common', ':source-featured-art', ':source-gallery', ':main', ':wearable', ':example-source-500px', 'example-contract-widget', 'example-watchface'
|
||||
+include ':api', ':android-client-common', ':source-featured-art', ':source-gallery', ':main', ':example-source-500px', 'example-contract-widget', 'example-watchface'
|
||||
+include ':api', ':android-client-common', ':source-featured-art', ':source-gallery', ':main', ':example-source-500px', 'example-contract-widget'
|
||||
|
|
Loading…
Reference in a new issue