diff options
| author | razorloves <razorloves@gmail.com> | 2019-01-28 01:51:44 -0600 |
|---|---|---|
| committer | razorloves <razorloves@gmail.com> | 2019-03-01 01:17:34 -0600 |
| commit | 20dbce7cdaaaf389a84d36af8494f5b19717c59d (patch) | |
| tree | 3ce93eb5f4a888a3b150500827e7977be842e918 /sailfish | |
| parent | ee8002a8d879b7b81bdf8c9ce80abdbbd7b943af (diff) | |
marlin: Squashed reverts of vendor img hacks
Building vendor image now so these hacks are no longer needed.
Revert "marlin: don't overwrite frameworks-res from vendor"
This reverts commit bfa6ea530d59eb6da6ab552ec5f45b9947d6140b.
Revert "marlin: Override theme overlay property"
This reverts commit 6b9a5347acd3ba94cf1265c5d13f5a34abd0a557.
Revert "marlin: use built lights hal on /system instead of /vendor"
This reverts commit 1e5bbe9c8e390d402d70852221c6a6ffc100ca0f.
Revert "marlin: Add Google platform certificate"
This reverts commit 26e577be8796a60d1fd2990ba769d46d51d6004c.
Change-Id: I8eb96b8074963cb417a42cd0eae3637a6712f50f
Diffstat (limited to 'sailfish')
| -rw-r--r-- | sailfish/device-lineage.mk | 10 | ||||
| -rw-r--r-- | sailfish/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml | 28 |
2 files changed, 0 insertions, 38 deletions
diff --git a/sailfish/device-lineage.mk b/sailfish/device-lineage.mk index fb8e8c0a..137942dc 100644 --- a/sailfish/device-lineage.mk +++ b/sailfish/device-lineage.mk @@ -1,11 +1 @@ -# Lights -PRODUCT_PACKAGES += \ - lights.sailfish_sys - -PRODUCT_PROPERTY_OVERRIDES += \ - ro.hardware.lights=sailfish_sys - -# Overlays -DEVICE_PACKAGE_OVERLAYS += device/google/marlin/sailfish/overlay-lineage - $(call inherit-product, device/google/marlin/device-lineage.mk) diff --git a/sailfish/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/sailfish/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml deleted file mode 100644 index 09d31bb3..00000000 --- a/sailfish/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 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. -*/ ---> - -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - - <!-- The list of vendor package signatures that should also be considered - platform signatures, specifically for use on devices with a vendor partition. --> - <string-array name="config_vendorPlatformSignatures" translatable="false"> - <item>308203BB308202A3A0030201020209008D29E529A07FEA47300D06092A864886F70D01010B05003074310B30090603550406130255533113301106035504080C0A43616C69666F726E69613116301406035504070C0D4D6F756E7461696E205669657731143012060355040A0C0B476F6F676C6520496E632E3110300E060355040B0C07416E64726F69643110300E06035504030C07416E64726F6964301E170D3136303531303139313333365A170D3433303932363139313333365A3074310B30090603550406130255533113301106035504080C0A43616C69666F726E69613116301406035504070C0D4D6F756E7461696E205669657731143012060355040A0C0B476F6F676C6520496E632E3110300E060355040B0C07416E64726F69643110300E06035504030C07416E64726F696430820122300D06092A864886F70D01010105000382010F003082010A0282010100E31E1FE7D1466CCC3725BCF26122EBBF3F81784C04FF6B33D9EB21093815B027680748076C3A7B7AE8F6D263B8E8FEC6A6EED6BF5CEC02DC22D77DB157454364F36DF1513738F96C847239DCBD71D7D3F74DCDF31F11B8AC0B1D90CDAEB3630B2C25C95B63C0ADA53CF4E9F494B6DD7CA60CEA463B5F60AC594E0E9954C60745DE0DB0931251D6A34E6FEB36D154B8C70B4D7D951334046116582E7953A8E8C4E7A529AF0F2F02501590F669390A7249485B58EE2177DACA6C1F4B8BBD7EE0B6F8A81AFD64427F0DA877AABBD91DB32F4768A51A6D491D82A74BFFAFB5082E422BA1EC4B1BDEE650F408BB2FD1873150417606766A0951559B21674EA08E8E430203010001A350304E301D0603551D0E04160414A3664021FD8231AFF9BC84F19E3C684100E42D19301F0603551D23041830168014A3664021FD8231AFF9BC84F19E3C684100E42D19300C0603551D13040530030101FF300D06092A864886F70D01010B05000382010100680FEB03A1E5BD7AA374EB627AF6F2536C9B1BEFD52528B4549E8244275940D3AC9A0E3167B2C938C74F114C42E4B6591448B35B292479AD3CF49167AE678FDA92D8B7537AE89307AF05EF1F02EF4E692195252D061B454D996A85AFDDF1CC6E9DF3CB624B84DFFA60E6C0BD0654DA8046CEFE2850F3A1ABA4AAC326A191A5DF615B89726368F7E677428443DE54706F91D6ACDFD55D47A60DCE0624CF8E848BB6FDFC938C88E689E98E2EF2CA720D71AE32229565FE78D959A02B7534353E21BD5EFB2631A3D1F6ED6F4637FBB386365AF851E4FD93F9FD18C70DE4BCF7A674F6158B7DB826528CCC9424F4FCFAA486E1D0047B3A342FB961AC11280587D3EF</item> - </string-array> - -</resources> |