Non GSI

duoqin/AndroidProducts.mk

@@ -1,3 +0,0 @@
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/duoqin_f21pro.mk \
-    $(LOCAL_DIR)/duoqin_f22pro.mk

duoqin/board-base.mk

@@ -1,2 +0,0 @@
-BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/wephone/duoqin/sepolicy
-TARGET_SYSTEM_PROP := device/wephone/duoqin/system.prop $(TARGET_SYSTEM_PROP)

duoqin/patches/F22Pro/platform_frameworks_base/button_backlights.patch

@@ -1,60 +0,0 @@
-diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
-index 1224902aa7be..68855ebf06b9 100644
---- a/services/core/java/com/android/server/display/DisplayPowerController.java
-+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
-@@ -70,6 +70,10 @@ import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory;
- import com.android.server.display.whitebalance.DisplayWhiteBalanceSettings;
- import com.android.server.policy.WindowManagerPolicy;
- 
-+// Button backlights
-+import com.android.server.lights.LightsManager;
-+import com.android.server.lights.LogicalLight;
-+
- import java.io.PrintWriter;
- 
- /**
-@@ -276,6 +280,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
-     // Must only be accessed on the handler thread.
-     private DisplayPowerState mPowerState;
- 
-+    // Buttons backlight
-+    private LightsManager mLightsManager;
-+    private LogicalLight mButtonsLight;
-+
-     // True if the device should wait for negative proximity sensor before
-     // waking up the screen.  This is set to false as soon as a negative
-     // proximity sensor measurement is observed or when the device is forced to
-@@ -817,6 +825,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
-         mPowerState = new DisplayPowerState(mBlanker,
-                 mColorFadeEnabled ? new ColorFade(mDisplayId) : null, mDisplayId, displayState);
- 
-+        mLightsManager = LocalServices.getService(LightsManager.class);
-+        mButtonsLight = mLightsManager.getLight(LightsManager.LIGHT_ID_BUTTONS);
-+
-         if (mColorFadeEnabled) {
-             mColorFadeOnAnimator = ObjectAnimator.ofFloat(
-                     mPowerState, DisplayPowerState.COLOR_FADE_LEVEL, 0.0f, 1.0f);
-@@ -1452,6 +1463,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
-                 && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_ON) {
-             setReportedScreenState(REPORTED_TO_POLICY_SCREEN_ON);
-             mWindowManagerPolicy.screenTurnedOn(mDisplayId);
-+            mButtonsLight.setBrightness(PowerManager.BRIGHTNESS_MAX);
-         }
- 
-         // Grab a wake lock if we have unfinished business.
-@@ -1652,6 +1664,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
-             setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF);
-             unblockScreenOn();
-             mWindowManagerPolicy.screenTurnedOff(mDisplayId);
-+            mButtonsLight.setBrightness(PowerManager.BRIGHTNESS_OFF_FLOAT);
-         } else if (!isOff
-                 && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_OFF) {
- 
-@@ -1659,6 +1672,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
-             // Complete the full state transition on -> turningOff -> off.
-             unblockScreenOff();
-             mWindowManagerPolicy.screenTurnedOff(mDisplayId);
-+            mButtonsLight.setBrightness(PowerManager.BRIGHTNESS_OFF_FLOAT);
-             setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF);
-         }
-         if (!isOff

qinf21pro/AndroidProducts.mk

@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/qinf21pro.mk 

qinf21pro/board-base.mk

@@ -0,0 +1 @@
+TARGET_SYSTEM_PROP := device/wephone/duoqin/system.prop $(TARGET_SYSTEM_PROP)

qinf21pro/qinf21pro.mk

@@ -1,30 +1,8 @@
-#
+TARGET_GAPPS_ARCH := arm64
-# All components inherited here go to system image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
 
-# Enable mainline checking
+include build/make/target/product/aosp_arm64_ab.mk
-# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 
-#
+PRODUCT_NAME := qinf21pro
-# All components inherited here go to system_ext image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
-
-#
-# All components inherited here go to product image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
-
-#
-# Special settings for GSI releasing
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
-
-
-PRODUCT_NAME := duoqin_f21pro
 PRODUCT_DEVICE := duoqin
 PRODUCT_BRAND := wephone
 PRODUCT_MODEL := weOs | v11.0.1 | Nehemiah