7.1.2 (N2G48C) - August 2017

google/dragon/Android.mk

@@ -1,10 +1,10 @@
-# Copyright (C) 2017 The Pure Nexus Project
+# Copyright (C) 2017 The LineageOS 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,38 +12,57 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# This file is generated by device/google/dragon/setup-makefiles.sh
+
 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_MODULE := UserInfoWidget
+LOCAL_MODULE_OWNER := google
+LOCAL_SRC_FILES := proprietary/app/UserInfoWidget/UserInfoWidget.apk
 LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := DragonKeyboardFirmwareUpdater
+LOCAL_MODULE_OWNER := google
+LOCAL_SRC_FILES := proprietary/priv-app/DragonKeyboardFirmwareUpdater/DragonKeyboardFirmwareUpdater.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
 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_MODULE_OWNER := google
+LOCAL_SRC_FILES := proprietary/priv-app/GCS/GCS.apk
 LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
 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_MODULE_OWNER := google
+LOCAL_SRC_FILES := proprietary/priv-app/HotwordEnrollment/HotwordEnrollment.apk
 LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 include $(BUILD_PREBUILT)
 
 endif

google/dragon/BoardConfigVendor.mk

@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The Pure Nexus Project
+# Copyright (C) 2017 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,3 +11,6 @@
 # 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.
+
+# This file is generated by device/google/dragon/setup-makefiles.sh
+

google/dragon/dragon-vendor.mk

@@ -0,0 +1,49 @@
+# Copyright (C) 2017 The LineageOS 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.
+
+# This file is generated by device/google/dragon/setup-makefiles.sh
+
+PRODUCT_COPY_FILES += \
+    vendor/google/dragon/proprietary/bin/tsec_service:system/bin/tsec_service \
+    vendor/google/dragon/proprietary/bin/vkinfo:system/bin/vkinfo \
+    vendor/google/dragon/proprietary/etc/sysconfig/nexus.xml:system/etc/sysconfig/nexus.xml
+
+PRODUCT_PACKAGES += \
+    UserInfoWidget \
+    DragonKeyboardFirmwareUpdater \
+    GCS \
+    HotwordEnrollment
+
+PRODUCT_COPY_FILES += \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/acr_ucode.bin:root/vendor/firmware/nouveau/acr_ucode.bin \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/fecs.bin:root/vendor/firmware/nouveau/fecs.bin \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/fecs_sig.bin:root/vendor/firmware/nouveau/fecs_sig.bin \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/gpmu_ucode_desc.bin:root/vendor/firmware/nouveau/gpmu_ucode_desc.bin \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/gpmu_ucode_image.bin:root/vendor/firmware/nouveau/gpmu_ucode_image.bin \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/nv12b_bundle:root/vendor/firmware/nouveau/nv12b_bundle \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/nv12b_fuc409c:root/vendor/firmware/nouveau/nv12b_fuc409c \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/nv12b_fuc409d:root/vendor/firmware/nouveau/nv12b_fuc409d \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/nv12b_fuc41ac:root/vendor/firmware/nouveau/nv12b_fuc41ac \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/nv12b_fuc41ad:root/vendor/firmware/nouveau/nv12b_fuc41ad \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/nv12b_method:root/vendor/firmware/nouveau/nv12b_method \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/nv12b_sw_ctx:root/vendor/firmware/nouveau/nv12b_sw_ctx \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/nv12b_sw_nonctx:root/vendor/firmware/nouveau/nv12b_sw_nonctx \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/pmu_bl.bin:root/vendor/firmware/nouveau/pmu_bl.bin \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nouveau/pmu_sig.bin:root/vendor/firmware/nouveau/pmu_sig.bin \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nvidia/tegra210/bpmp.bin:root/vendor/firmware/nvidia/tegra210/bpmp.bin \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nvidia/tegra210/nvdec_bl_prod.bin:root/vendor/firmware/nvidia/tegra210/nvdec_bl_prod.bin \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nvidia/tegra210/nvdec_ns.bin:root/vendor/firmware/nvidia/tegra210/nvdec_ns.bin \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nvidia/tegra210/nvdec_prod.bin:root/vendor/firmware/nvidia/tegra210/nvdec_prod.bin \
+    vendor/google/dragon/proprietary/root/vendor/firmware/nvidia/tegra210/xusb.bin:root/vendor/firmware/nvidia/tegra210/xusb.bin
+

google_devices/dragon/device-vendor.mk

@@ -1,29 +0,0 @@
-# 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.
-
-$(call inherit-product, vendor/google_devices/dragon/dragon-vendor-blobs.mk)
-
-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

@@ -1,38 +0,0 @@
-# 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,28 +0,0 @@
-# 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 := 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