Merge branch 'lineage-18.1' into eleven

Author: Megh-Rana

build/envsetup.sh

@@ -837,7 +837,7 @@ function dopush()
         CHKPERM="/data/local/tmp/chkfileperm.sh"
 (
 cat <<'EOF'
-#!/system/xbin/sh
+#!/system/bin/sh
 FILE=$@
 if [ -e $FILE ]; then
     ls -l $FILE | awk '{k=0;for(i=0;i<=8;i++)k+=((substr($1,i+2,1)~/[rwx]/)*2^(8-i));if(k)printf("%0o ",k);print}' | cut -d ' ' -f1
@@ -883,7 +883,7 @@ EOF
                 fi
                 adb shell restorecon "$TARGET"
             ;;
-            /system/priv-app/SystemUI/SystemUI.apk|/system/framework/*)
+            */SystemUI.apk|*/framework/*)
                 # Only need to stop services once
                 if ! $stop_n_start; then
                     adb shell stop

build/soong/Android.bp

@@ -174,6 +174,23 @@ ignores_ftp_pptp_conntrack_failure_defaults {
     },
 }
 
+soong_config_module_type {
+    name: "needs_camera_boottime",
+    module_type: "cc_defaults",
+    config_namespace: "lineageGlobalVars",
+    bool_variables: ["needs_camera_boottime"],
+    properties: ["cppflags"],
+}
+
+needs_camera_boottime {
+    name: "needs_camera_boottime_defaults",
+    soong_config_variables: {
+        needs_camera_boottime: {
+            cppflags: ["-DTARGET_CAMERA_BOOTTIME_TIMESTAMP"],
+        },
+    },
+}
+
 soong_config_module_type {
     name: "needs_netd_direct_connect_rule",
     module_type: "cc_defaults",

build/target/product/AndroidProducts.mk

@@ -26,7 +26,9 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/lineage_tv_arm.mk \
     $(LOCAL_DIR)/lineage_tv_arm64.mk \
     $(LOCAL_DIR)/lineage_tv_x86.mk \
-    $(LOCAL_DIR)/lineage_tv_x86_64.mk
+    $(LOCAL_DIR)/lineage_tv_x86_64.mk \
+    $(LOCAL_DIR)/lineage_car_arm64.mk \
+    $(LOCAL_DIR)/lineage_car_x86_64.mk
 
 COMMON_LUNCH_CHOICES := \
     lineage_arm-userdebug \
@@ -40,4 +42,6 @@ COMMON_LUNCH_CHOICES := \
     lineage_tv_arm-userdebug \
     lineage_tv_arm64-userdebug \
     lineage_tv_x86-userdebug \
-    lineage_tv_x86_64-userdebug
+    lineage_tv_x86_64-userdebug \
+    lineage_car_arm64-userdebug \
+    lineage_car_x86_64-userdebug

build/target/product/lineage_car_arm64.mk

@@ -0,0 +1,21 @@
+# Copyright (C) 2018-2020 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.
+
+include vendor/lineage/build/target/product/lineage_generic_car_target.mk
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
+
+TARGET_NO_KERNEL_OVERRIDE := true
+
+PRODUCT_NAME := lineage_car_arm64

build/target/product/lineage_car_x86_64.mk

@@ -0,0 +1,19 @@
+# Copyright (C) 2018-2020 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.
+
+include vendor/lineage/build/target/product/lineage_generic_car_target.mk
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
+
+PRODUCT_NAME := lineage_car_x86_64

build/target/product/lineage_generic_car_target.mk

@@ -0,0 +1,22 @@
+# Copyright (C) 2019-2020 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.
+
+$(call inherit-product, vendor/lineage/config/common_car.mk)
+$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk)
+
+EMULATOR_VENDOR_NO_SENSORS := true
+EMULATOR_VENDOR_NO_SOUND := true
+
+# Allow building otatools
+TARGET_FORCE_OTA_PACKAGE := true

build/tasks/bacon.mk

@@ -18,12 +18,12 @@
 
 LINEAGE_TARGET_PACKAGE := $(PRODUCT_OUT)/$(LINEAGE_VERSION).zip
 
-MD5 := prebuilts/build-tools/path/$(HOST_PREBUILT_TAG)/md5sum
+SHA256 := prebuilts/build-tools/path/$(HOST_PREBUILT_TAG)/sha256sum
 
 .PHONY: bacon
 bacon: $(INTERNAL_OTA_PACKAGE_TARGET)
 	$(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(LINEAGE_TARGET_PACKAGE)
-	$(hide) $(MD5) $(LINEAGE_TARGET_PACKAGE) | sed "s|$(PRODUCT_OUT)/||" > $(LINEAGE_TARGET_PACKAGE).md5sum
+	$(hide) $(SHA256) $(LINEAGE_TARGET_PACKAGE) | sed "s|$(PRODUCT_OUT)/||" > $(LINEAGE_TARGET_PACKAGE).sha256sum
 	@echo "Package Complete: $(LINEAGE_TARGET_PACKAGE)" >&2
 	@echo "Build is getting done..." >&2
 	$(hide) bash vendor/lineage/build/tools/cipher.sh