Commit 05339fa3 authored by Brandon Wylie's avatar Brandon Wylie Committed by Commit Bot

[Feed] Import feed@e291161061d18d222bc1b546225fe0567386cbf1

Specifics:
        +6,604 bytes normalized apk size
            +1 zip entries file count
        +5,308 bytes main dex size
InstallSize:
        +1,296 bytes APK size
    +22,740.32 bytes Estimated installed size
InstallBreakdown (+24,585.32 bytes):
          +268 bytes Non-compiled Android resources size
          +173 bytes Package metadata size
    +23,436.32 bytes Java code size
          +708 bytes Compiled Android resources size
Dex:
           +23 entries fields
           +33 entries methods
            +3 entries types
            +9 entries strings

Change-Id: I9dcf0da1a60a2d50925a68bc0b5345245b64059d
Reviewed-on: https://chromium-review.googlesource.com/c/1257654
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Reviewed-by: default avatarFilip Gorski <fgorski@chromium.org>
Reviewed-by: default avatarSky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596310}
parent dbd044a3
...@@ -181,7 +181,7 @@ vars = { ...@@ -181,7 +181,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed # the commit queue can handle CLs rolling feed
# and whatever else without interference from each other. # and whatever else without interference from each other.
'feed_revision': '3c5a5efeacbb25d349b36c3482c5794c5229e869', 'feed_revision': 'e291161061d18d222bc1b546225fe0567386cbf1',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_build-tools_version # the commit queue can handle CLs rolling android_sdk_build-tools_version
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -123,9 +123,10 @@ public class FeedProcessScopeFactory { ...@@ -123,9 +123,10 @@ public class FeedProcessScopeFactory {
private static Configuration createConfiguration() { private static Configuration createConfiguration() {
return new Configuration.Builder() return new Configuration.Builder()
.put(ConfigKey.FEED_SERVER_HOST, "https://www.google.com") .put(ConfigKey.FEED_SERVER_ENDPOINT, FeedConfiguration.getFeedServerEndpoint())
.put(ConfigKey.FEED_SERVER_PATH_AND_PARAMS, .put(ConfigKey.FEED_SERVER_METHOD, FeedConfiguration.getFeedServerEndpoint())
"/httpservice/noretry/NowStreamService/FeedQuery") .put(ConfigKey.FEED_SERVER_RESPONSE_LENGTH_PREFIXED,
FeedConfiguration.getFeedServerReponseLengthPrefixed())
.put(ConfigKey.SESSION_LIFETIME_MS, FeedConfiguration.getSessionLifetimeMs()) .put(ConfigKey.SESSION_LIFETIME_MS, FeedConfiguration.getSessionLifetimeMs())
.put(ConfigKey.VIEW_LOG_THRESHOLD, FeedConfiguration.getViewLogThreshold()) .put(ConfigKey.VIEW_LOG_THRESHOLD, FeedConfiguration.getViewLogThreshold())
.put(ConfigKey.LOGGING_IMMEDIATE_CONTENT_THRESHOLD_MS, .put(ConfigKey.LOGGING_IMMEDIATE_CONTENT_THRESHOLD_MS,
......
...@@ -14,20 +14,41 @@ android_resources("piet_resources") { ...@@ -14,20 +14,41 @@ android_resources("piet_resources") {
custom_package = "com.google.android.libraries.feed.piet" custom_package = "com.google.android.libraries.feed.piet"
} }
android_resources("basicstream_resources") { android_resources("basicstream_internal_viewholders_resources") {
resource_dirs = [ "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/res" ] resource_dirs = [ "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders/res" ]
custom_package = custom_package =
"com.google.android.libraries.feed.basicstream.internal.viewholders" "com.google.android.libraries.feed.basicstream.internal.viewholders"
} }
android_resources("basicstream_resources") {
resource_dirs =
[ "src/src/main/java/com/google/android/libraries/feed/basicstream/res/" ]
custom_package = "com.google.android.libraries.feed.basicstream"
}
android_resources("shared_stream_publicapi_menumeasurer_resources") {
resource_dirs = [ "src/src/main/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer/res/" ]
custom_package =
"com.google.android.libraries.feed.sharedstream.publicapi.menumeasurer"
}
android_resources("basicstream_internal_actions_resources") {
resource_dirs = [ "src/src/main/java/com/google/android/libraries/feed/basicstream/internal/actions/res/" ]
custom_package =
"com.google.android.libraries.feed.basicstream.internal.actions"
}
android_library("feed_lib_java") { android_library("feed_lib_java") {
chromium_code = false chromium_code = false
java_files = feed_lib_java_sources java_files = feed_lib_java_sources
deps = [ deps = [
":basicstream_internal_actions_resources",
":basicstream_internal_viewholders_resources",
":basicstream_resources", ":basicstream_resources",
":feed_lib_proto_java", ":feed_lib_proto_java",
":piet_resources", ":piet_resources",
":shared_stream_publicapi_menumeasurer_resources",
"//third_party/android_deps:android_support_annotations_java", "//third_party/android_deps:android_support_annotations_java",
"//third_party/android_deps:android_support_cardview_java", "//third_party/android_deps:android_support_cardview_java",
"//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:android_support_v7_appcompat_java",
......
...@@ -2,7 +2,7 @@ Name: Feed ...@@ -2,7 +2,7 @@ Name: Feed
Short name: feed Short name: feed
URL: https://chromium.googlesource.com/feed URL: https://chromium.googlesource.com/feed
Version: 0 Version: 0
Revision: 3c5a5efeacbb25d349b36c3482c5794c5229e869 Revision: e291161061d18d222bc1b546225fe0567386cbf1
License: Apache 2.0 License: Apache 2.0
License File: LICENSE License File: LICENSE
Security Critical: yes Security Critical: yes
......
...@@ -158,6 +158,7 @@ feed_lib_java_sources = [ ...@@ -158,6 +158,7 @@ feed_lib_java_sources = [
"src/src/main/java/com/google/android/libraries/feed/host/action/StreamActionApi.java", "src/src/main/java/com/google/android/libraries/feed/host/action/StreamActionApi.java",
"src/src/main/java/com/google/android/libraries/feed/host/config/Configuration.java", "src/src/main/java/com/google/android/libraries/feed/host/config/Configuration.java",
"src/src/main/java/com/google/android/libraries/feed/host/config/DebugBehavior.java", "src/src/main/java/com/google/android/libraries/feed/host/config/DebugBehavior.java",
"src/src/main/java/com/google/android/libraries/feed/host/imageloader/BundledAssets.java",
"src/src/main/java/com/google/android/libraries/feed/host/imageloader/ImageLoaderApi.java", "src/src/main/java/com/google/android/libraries/feed/host/imageloader/ImageLoaderApi.java",
"src/src/main/java/com/google/android/libraries/feed/host/logging/ActionType.java", "src/src/main/java/com/google/android/libraries/feed/host/logging/ActionType.java",
"src/src/main/java/com/google/android/libraries/feed/host/logging/BasicLoggingApi.java", "src/src/main/java/com/google/android/libraries/feed/host/logging/BasicLoggingApi.java",
...@@ -228,6 +229,7 @@ feed_lib_java_sources = [ ...@@ -228,6 +229,7 @@ feed_lib_java_sources = [
"src/src/main/java/com/google/android/libraries/feed/piet/host/CustomElementProvider.java", "src/src/main/java/com/google/android/libraries/feed/piet/host/CustomElementProvider.java",
"src/src/main/java/com/google/android/libraries/feed/piet/host/HostBindingProvider.java", "src/src/main/java/com/google/android/libraries/feed/piet/host/HostBindingProvider.java",
"src/src/main/java/com/google/android/libraries/feed/piet/ui/DrawableScalingHelper.java", "src/src/main/java/com/google/android/libraries/feed/piet/ui/DrawableScalingHelper.java",
"src/src/main/java/com/google/android/libraries/feed/piet/ui/GridRowView.java",
"src/src/main/java/com/google/android/libraries/feed/piet/ui/RoundedCornerColorDrawable.java", "src/src/main/java/com/google/android/libraries/feed/piet/ui/RoundedCornerColorDrawable.java",
"src/src/main/java/com/google/android/libraries/feed/piet/ui/RoundedCornerImageView.java", "src/src/main/java/com/google/android/libraries/feed/piet/ui/RoundedCornerImageView.java",
"src/src/main/java/com/google/android/libraries/feed/piet/ui/RoundedCornerViewHelper.java", "src/src/main/java/com/google/android/libraries/feed/piet/ui/RoundedCornerViewHelper.java",
...@@ -235,6 +237,8 @@ feed_lib_java_sources = [ ...@@ -235,6 +237,8 @@ feed_lib_java_sources = [
"src/src/main/java/com/google/android/libraries/feed/sharedstream/piet/PietAssetProvider.java", "src/src/main/java/com/google/android/libraries/feed/sharedstream/piet/PietAssetProvider.java",
"src/src/main/java/com/google/android/libraries/feed/sharedstream/piet/PietCustomElementProvider.java", "src/src/main/java/com/google/android/libraries/feed/sharedstream/piet/PietCustomElementProvider.java",
"src/src/main/java/com/google/android/libraries/feed/sharedstream/piet/PietHostBindingProvider.java", "src/src/main/java/com/google/android/libraries/feed/sharedstream/piet/PietHostBindingProvider.java",
"src/src/main/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer/MenuMeasurer.java",
"src/src/main/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer/Size.java",
"src/src/main/java/com/google/android/libraries/feed/sharedstream/removetrackingfactory/StreamRemoveTrackingFactory.java", "src/src/main/java/com/google/android/libraries/feed/sharedstream/removetrackingfactory/StreamRemoveTrackingFactory.java",
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment