dragon-nougat

google_devices/dragon/BoardConfigPartial.mk

@@ -1,13 +0,0 @@
-# Copyright 2015 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.

google_devices/dragon/BoardConfigVendor.mk

@@ -1,18 +1,13 @@
-# Copyright 2015 The Android Open Source Project
+# Copyright (C) 2017 The Pure Nexus 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
+# 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.
-
-LOCAL_STEM := dragon/BoardConfigPartial.mk
-
--include vendor/google_devices/$(LOCAL_STEM)
--include vendor/nvidia/$(LOCAL_STEM)

google_devices/dragon/device-partial.mk

@@ -1,18 +0,0 @@
-# Copyright 2015 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.
-
-# Vendor blob(s) necessary for Dragon hardware
-PRODUCT_COPY_FILES := \
-    vendor/google_devices/dragon/proprietary/vendor.img:vendor.img:google \
-

google_devices/dragon/device-vendor.mk

@@ -1,10 +1,10 @@
-# Copyright 2015 The Android Open Source Project
+# Copyright (C) 2017 The Pure Nexus 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
+# 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,
@@ -12,7 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_STEM := dragon/device-partial.mk
+$(call inherit-product, vendor/google_devices/dragon/dragon-vendor-blobs.mk)
 
-$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM))
-$(call inherit-product-if-exists, vendor/nvidia/$(LOCAL_STEM))
+ifeq ($(TARGET_DEVICE),dragon)
+$(shell mkdir -p $(TARGET_ROOT_OUT)/vendor)
+endif
+
+# Prebuilt /app
+PRODUCT_PACKAGES += \
+    UserInfoWidget
+
+# Prebuilt /priv-app
+PRODUCT_PACKAGES += \
+    DragonKeyboardFirmwareUpdater \
+    GCS \
+    HotwordEnrollment

google_devices/dragon/dragon-vendor-blobs.mk

@@ -0,0 +1,38 @@
+# Copyright (C) 2017 The Pure Nexus 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.
+
+PRODUCT_COPY_FILES += \
+    vendor/google_devices/dragon/proprietary/bin/tsec_service:system/bin/tsec_service \
+    vendor/google_devices/dragon/proprietary/bin/vkinfo:system/bin/vkinfo \
+    vendor/google_devices/dragon/proprietary/etc/sysconfig/nexus.xml:system/etc/sysconfig/nexus.xml \
+    vendor/google_devices/dragon/proprietary/acr_ucode.bin:root/vendor/firmware/nouveau/acr_ucode.bin \
+    vendor/google_devices/dragon/proprietary/fecs.bin:root/vendor/firmware/nouveau/fecs.bin \
+    vendor/google_devices/dragon/proprietary/fecs_sig.bin:root/vendor/firmware/nouveau/fecs_sig.bin \
+    vendor/google_devices/dragon/proprietary/gpmu_ucode_desc.bin:root/vendor/firmware/nouveau/gpmu_ucode_desc.bin \
+    vendor/google_devices/dragon/proprietary/gpmu_ucode_image.bin:root/vendor/firmware/nouveau/gpmu_ucode_image.bin \
+    vendor/google_devices/dragon/proprietary/nv12b_bundle:root/vendor/firmware/nouveau/nv12b_bundle \
+    vendor/google_devices/dragon/proprietary/nv12b_fuc409c:root/vendor/firmware/nouveau/nv12b_fuc409c \
+    vendor/google_devices/dragon/proprietary/nv12b_fuc409d:root/vendor/firmware/nouveau/nv12b_fuc409d \
+    vendor/google_devices/dragon/proprietary/nv12b_fuc41ac:root/vendor/firmware/nouveau/nv12b_fuc41ac \
+    vendor/google_devices/dragon/proprietary/nv12b_fuc41ad:root/vendor/firmware/nouveau/nv12b_fuc41ad \
+    vendor/google_devices/dragon/proprietary/nv12b_method:root/vendor/firmware/nouveau/nv12b_method \
+    vendor/google_devices/dragon/proprietary/nv12b_sw_ctx:root/vendor/firmware/nouveau/nv12b_sw_ctx \
+    vendor/google_devices/dragon/proprietary/nv12b_sw_nonctx:root/vendor/firmware/nouveau/nv12b_sw_nonctx \
+    vendor/google_devices/dragon/proprietary/pmu_bl.bin:root/vendor/firmware/nouveau/pmu_bl.bin \
+    vendor/google_devices/dragon/proprietary/pmu_sig.bin:root/vendor/firmware/nouveau/pmu_sig.bin \
+    vendor/google_devices/dragon/proprietary/bpmp.bin:root/vendor/firmware/nvidia/tegra210/bpmp.bin \
+    vendor/google_devices/dragon/proprietary/nvdec_bl_prod.bin:root/vendor/firmware/nvidia/tegra210/nvdec_bl_prod.bin \
+    vendor/google_devices/dragon/proprietary/nvdec_ns.bin:root/vendor/firmware/nvidia/tegra210/nvdec_ns.bin \
+    vendor/google_devices/dragon/proprietary/nvdec_prod.bin:root/vendor/firmware/nvidia/tegra210/nvdec_prod.bin \
+    vendor/google_devices/dragon/proprietary/xusb.bin:root/vendor/firmware/nvidia/tegra210/xusb.bin

google_devices/dragon/proprietary/app/Android.mk

@@ -1,4 +1,4 @@
-# Copyright 2016 The Android Open Source Project
+# Copyright (C) 2017 The Pure Nexus Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+LOCAL_PATH := $(call my-dir)
+
 ifeq ($(TARGET_DEVICE),dragon)
-$(shell mkdir -p $(TARGET_ROOT_OUT)/vendor)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := UserInfoWidget
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := UserInfoWidget/UserInfoWidget.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+include $(BUILD_PREBUILT)
+
 endif

google_devices/dragon/proprietary/etc/sysconfig/nexus.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- These are configurations that should exist on Google's 2016 and newer
+     Nexus tablet devices. -->
+<config>
+    <!-- This is meant to be the canonical feature identifying 2016 and newer Nexus devices. -->
+    <feature name="com.google.android.feature.PIXEL_EXPERIENCE" />
+
+    <!-- This is meant to be the canonical feature identifying 2016 and newer
+         Nexus tablet devices. -->
+    <feature name="com.google.android.feature.PIXEL_TABLET_EXPERIENCE" />
+</config>

google_devices/dragon/proprietary/priv-app/Android.mk

@@ -0,0 +1,49 @@
+# Copyright (C) 2017 The Pure Nexus 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.
+
+LOCAL_PATH := $(call my-dir)
+
+ifeq ($(TARGET_DEVICE),dragon)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := DragonKeyboardFirmwareUpdater
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := DragonKeyboardFirmwareUpdater/DragonKeyboardFirmwareUpdater.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_CLASS := APPS
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := GCS
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := GCS/GCS.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_CLASS := APPS
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := HotwordEnrollment
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := HotwordEnrollment/HotwordEnrollment.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_CLASS := APPS
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+include $(BUILD_PREBUILT)
+
+endif

nvidia/dragon/BoardConfigPartial.mk

@@ -1,13 +0,0 @@
-# Copyright 2015 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.

nvidia/dragon/device-partial.mk

@@ -1,37 +0,0 @@
-# Copyright 2015 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.
-
-# Nvidia blob(s) necessary for Dragon hardware
-PRODUCT_COPY_FILES := \
-    vendor/nvidia/dragon/proprietary/acr_ucode.bin:root/vendor/firmware/nouveau/acr_ucode.bin:nvidia \
-    vendor/nvidia/dragon/proprietary/fecs.bin:root/vendor/firmware/nouveau/fecs.bin:nvidia \
-    vendor/nvidia/dragon/proprietary/fecs_sig.bin:root/vendor/firmware/nouveau/fecs_sig.bin:nvidia \
-    vendor/nvidia/dragon/proprietary/gpmu_ucode_desc.bin:root/vendor/firmware/nouveau/gpmu_ucode_desc.bin:nvidia \
-    vendor/nvidia/dragon/proprietary/gpmu_ucode_image.bin:root/vendor/firmware/nouveau/gpmu_ucode_image.bin:nvidia \
-    vendor/nvidia/dragon/proprietary/nv12b_bundle:root/vendor/firmware/nouveau/nv12b_bundle:nvidia \
-    vendor/nvidia/dragon/proprietary/nv12b_fuc409c:root/vendor/firmware/nouveau/nv12b_fuc409c:nvidia \
-    vendor/nvidia/dragon/proprietary/nv12b_fuc409d:root/vendor/firmware/nouveau/nv12b_fuc409d:nvidia \
-    vendor/nvidia/dragon/proprietary/nv12b_fuc41ac:root/vendor/firmware/nouveau/nv12b_fuc41ac:nvidia \
-    vendor/nvidia/dragon/proprietary/nv12b_fuc41ad:root/vendor/firmware/nouveau/nv12b_fuc41ad:nvidia \
-    vendor/nvidia/dragon/proprietary/nv12b_method:root/vendor/firmware/nouveau/nv12b_method:nvidia \
-    vendor/nvidia/dragon/proprietary/nv12b_sw_ctx:root/vendor/firmware/nouveau/nv12b_sw_ctx:nvidia \
-    vendor/nvidia/dragon/proprietary/nv12b_sw_nonctx:root/vendor/firmware/nouveau/nv12b_sw_nonctx:nvidia \
-    vendor/nvidia/dragon/proprietary/pmu_bl.bin:root/vendor/firmware/nouveau/pmu_bl.bin:nvidia \
-    vendor/nvidia/dragon/proprietary/pmu_sig.bin:root/vendor/firmware/nouveau/pmu_sig.bin:nvidia \
-    vendor/nvidia/dragon/proprietary/bpmp.bin:root/vendor/firmware/nvidia/tegra210/bpmp.bin:nvidia \
-    vendor/nvidia/dragon/proprietary/nvdec_bl_prod.bin:root/vendor/firmware/nvidia/tegra210/nvdec_bl_prod.bin:nvidia \
-    vendor/nvidia/dragon/proprietary/nvdec_ns.bin:root/vendor/firmware/nvidia/tegra210/nvdec_ns.bin:nvidia \
-    vendor/nvidia/dragon/proprietary/nvdec_prod.bin:root/vendor/firmware/nvidia/tegra210/nvdec_prod.bin:nvidia \
-    vendor/nvidia/dragon/proprietary/xusb.bin:root/vendor/firmware/nvidia/tegra210/xusb.bin:nvidia \
-