Changes for January 2020

- More FOD-related commits to revert
- Added a reference local manifest
This commit is contained in:
Andy CrossGate Yan 2020-01-11 13:01:51 +08:00
parent c02a16ccb8
commit 88b149d406
3 changed files with 20 additions and 24 deletions

View File

@ -1,14 +1,13 @@
From c1784a15c22eee3404065da12ec5edca061916e8 Mon Sep 17 00:00:00 2001
From 8a1c7866b848c51ad470fecc330d023dd5556d43 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 17 Nov 2019 00:55:11 +0000
Date: Tue, 24 Dec 2019 15:32:21 +0000
Subject: [PATCH] cryptfshw: Remove dependency on generated kernel headers
Change-Id: I217b74e961ad3a0681acfb4aeee82f09a846078e
Change-Id: I1a95cf9f4391c40bec79d5380ee9a4dc57dbe2ac
---
cryptfshw/1.0/Android.bp | 2 +-
cryptfshw/1.0/kernel/Android.bp | 2 +-
cryptfshw/1.0/qsee/Android.bp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
cryptfshw/1.0/Android.bp | 2 +-
cryptfshw/1.0/qsee/Android.bp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cryptfshw/1.0/Android.bp b/cryptfshw/1.0/Android.bp
index fe511ff..6157075 100644
@ -19,19 +18,6 @@ index fe511ff..6157075 100644
],
export_include_dirs: ["."],
- header_libs: ["generated_kernel_headers"],
+ header_libs: ["device_kernel_headers"],
shared_libs: [
"libbase",
"libhidlbase",
diff --git a/cryptfshw/1.0/kernel/Android.bp b/cryptfshw/1.0/kernel/Android.bp
index 1c1f9af..909d5ec 100644
--- a/cryptfshw/1.0/kernel/Android.bp
+++ b/cryptfshw/1.0/kernel/Android.bp
@@ -31,7 +31,7 @@ cc_binary {
cflags: ["-DARCH_ARM_32"],
},
},
- header_libs: ["generated_kernel_headers"],
+ header_libs: ["device_kernel_headers"],
shared_libs: [
"libbase",

View File

@ -3,6 +3,8 @@
repo sync -c --force-sync --no-clone-bundle --no-tags -j$(nproc --all)
cd frameworks/base
git revert 9213b9f5aa79d25a9633df99a7922c4c7f72dfda --no-edit #FODCircleView: rewrite and simplify implementation
git revert 71e6d97d3fe05ebd2fe3dc7f5eee846b13b88131 --no-edit #FODCircleView: place above other UI elements
git revert 6077075200cce9f66a688012786b054d0843ed6c --no-edit #fw/b: Fix systemui tests with in-display fingerprint
git revert 737170f406d850c79efc961e9d4026dd10db4f88 --no-edit #FODCircleView: defer removal to next re-layout
git revert 471cf7dc1478fce893e77ac1fb97dfbeeb5af2e7 --no-edit #Initial support for in-display fingerprint sensors
@ -20,11 +22,8 @@ source build/envsetup.sh &> /dev/null
echo ""
echo "Picking temporary stuff"
repopick -Q "(topic:"ten-vold"+OR+"10-qcom-encryption"+OR+"10-qcom-encryption-fbe-wrapped-key")+status:open+NOT+owner:javelinanddart@gmail.com"
repopick 263896 #cryptfshw: Introduce kernel backend implementation
repopick -t ten-vold
echo ""
#repopick 256308 #tinycompress: Enable extended compress format
#repopick 259449 #config: Mark more gralloc bits as valid
#read -p "Press any key to start building, or CTRL-C to exit" nothing

11
roomservice.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<project name="LineageOS/android_packages_apps_Profiles" path="packages/apps/Profiles" />
<project name="LineageOS/android_packages_resources_devicesettings" path="packages/resources/devicesettings" remote="github" />
<project name="phhusson/vendor_hardware_overlay" path="vendor/hardware_overlay" remote="github" revision="pie" />
<project name="phhusson/device_phh_treble" path="device/phh/treble" remote="github" revision="android-10.0" />
<project name="phhusson/vendor_vndk" path="vendor/vndk" remote="github" revision="android-10.0" />
<project name="phhusson/vendor_vndk-tests" path="vendor/vndk-tests" remote="github" revision="master" />
<project name="phhusson/vendor_interfaces" path="vendor/interfaces" remote="github" revision="pie" />
<project name="phhusson/vendor_magisk" path="vendor/magisk" remote="github" revision="android-10.0" />
</manifest>