Skip to content
This repository has been archived by the owner on Dec 12, 2023. It is now read-only.

Commit

Permalink
Add BT QTI revert patch
Browse files Browse the repository at this point in the history
  • Loading branch information
ponces committed Dec 26, 2021
1 parent 75f0199 commit 06f57f1
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From 8383c36a099d0461ae308d2214d9cebbcf25a53f Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <[email protected]>
Date: Sun, 8 Aug 2021 01:43:40 +0000
Subject: [PATCH] Revert "Bluetooth: Reset packages/apps/Bluetooth to upstream"

This reverts commit 4ceb47e32c1be30640e40f81b6f741942f8598ed.
---
Android.bp | 5 -----
tests/robotests/Android.mk | 4 ----
2 files changed, 9 deletions(-)

diff --git a/Android.bp b/Android.bp
index 43e6f81a0..66e2eb50b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,3 @@
-// Bluetooth is in it's own namespace to allow it to be replaced with an
-// alternate implementation.
-soong_namespace {
-}
-
// MAP API module

package {
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index 4d3527ae0..afcfa11ad 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -1,5 +1,3 @@
-ifneq ($(TARGET_USE_QTI_BT_STACK),true)
-
#############################################################
# Bluetooth Robolectric test target. #
#############################################################
@@ -51,5 +49,3 @@ LOCAL_TEST_PACKAGE := Bluetooth
LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src

include external/robolectric-shadows/run_robotests.mk
-
-endif
--
2.25.1

1 change: 1 addition & 0 deletions pe.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
$(call inherit-product, vendor/aosp/config/common_full_phone.mk)
$(call inherit-product, vendor/aosp/config/BoardConfigSoong.mk)
$(call inherit-product, device/custom/sepolicy/common/sepolicy.mk)
-include vendor/aosp/build/core/config.mk
TARGET_BOOT_ANIMATION_RES := 1080

0 comments on commit 06f57f1

Please sign in to comment.