Commit 5c2e346a authored by David Kataja Jr's avatar David Kataja Jr
Browse files

Update for NMF26V

Change-Id: If3576543b9cf55adf49f2747f3c394b8cd9518ef
parent 0082e0e4
......@@ -244,28 +244,6 @@ LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_DEX_PREOPT := false
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := com.google.android.camera.experimental2016
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_SYSTEM)/framework
LOCAL_SRC_FILES := proprietary/framework/com.google.android.camera.experimental2016.jar
LOCAL_CERTIFICATE := platform
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
LOCAL_DEX_PREOPT := false
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := com.google.android.media.effects
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_SYSTEM)/framework
LOCAL_SRC_FILES := proprietary/framework/com.google.android.media.effects.jar
LOCAL_CERTIFICATE := platform
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
LOCAL_DEX_PREOPT := false
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := VerizonUnifiedSettings
LOCAL_MODULE_TAGS := optional
......
......@@ -44,8 +44,6 @@ PRODUCT_PACKAGES += \
# Prebuilt APKs/JARs from 'proprietary/framework'
PRODUCT_PACKAGES += \
com.google.android.camera.experimental2016 \
com.google.android.media.effects \
VerizonUnifiedSettings
# Prebuilt APKs/JARs from 'proprietary/priv-app'
......
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 The Android Open Source 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.
-->
<permissions>
<library name="com.google.android.media.effects"
......
......@@ -4,4 +4,8 @@
<config>
<!-- This is meant to be the canonical feature identifying 2016 and newer Nexus devices. -->
<feature name="com.google.android.feature.PIXEL_EXPERIENCE" />
<!-- Both versions of this string are needed due to a miscommunication. b/29978934 -->
<feature name="com.google.android.apps.photos.NEXUS_PRELOAD" />
<feature name="com.google.android.apps.photos.nexus_preload" />
</config>
Supports Markdown
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