PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gui: fix bad merge

Browse Source 
Change-Id: I67dc921a35e6dbc419bd9cfebcca66296b65d8e6
This commit is contained in:
bigbiff
2021-03-27 17:03:43 -04:00
parent 9754a0771c
commit 7d7d0855d4
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/Android.mk
View File

@@ -1,6 +1,4 @@
LOCAL_PATH := $(call my-dir)
<<<<<<< HEAD
=======
include $(CLEAR_VARS)
LOCAL_CFLAGS := -fno-strict-aliasing -Wno-implicit-fallthrough
@@ -140,7 +138,6 @@ endif
LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"
include $(BUILD_STATIC_LIBRARY)
>>>>>>> 8fde396e... bootable: Change how blank screen works
# Transfer in the resources for the device
include $(CLEAR_VARS)