Skip to content

[A-12][Temp-Fix][Dont merge] fix compilation issue #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bkothapx wants to merge 1 commit into
base: android/s
Choose a base branch
from
Open

[A-12][Temp-Fix][Dont merge] fix compilation issue #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ...e/intel/civ/host/virtual-input-manager/0001-A12-compilation-fix-for-IO-stream-error.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
From b5755433730fbb2904aa725c1a1db4bb7ae8a5fa Mon Sep 17 00:00:00 2001
From: "Kothapeta, BikshapathiX" <[email protected]>
Date: Mon, 5 Jun 2023 13:52:50 +0530
Subject: [PATCH] [A12]compilation fix for IO-stream error:

Disable make for the virtual_input_manager

Tracked-On:
Signed-off-by: Kothapeta, BikshapathiX <[email protected]>

diff --git a/Makefile b/DisableMakefile
similarity index 100%
rename from Makefile
rename to DisableMakefile
--
2.40.1

34 changes: 34 additions & 0 deletions bsp_diff/caas/device/intel/mixins/0044-A-12-Dont-Merge-Fix-compilation-issue.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From 4093aff383ab9d7fac6f4d03b68510b91db67fd2 Mon Sep 17 00:00:00 2001
From: "Kothapeta, BikshapathiX" <[email protected]>
Date: Mon, 5 Jun 2023 13:54:29 +0530
Subject: [PATCH] [A-12][Dont Merge]Fix compilation issue.

Tracked-On:
Signed-off-by: Kothapeta, BikshapathiX <[email protected]>

diff --git a/groups/device-specific/caas/AndroidBoard.mk b/groups/device-specific/caas/AndroidBoard.mk
index e9d8594..cabbf2a 100644
--- a/groups/device-specific/caas/AndroidBoard.mk
+++ b/groups/device-specific/caas/AndroidBoard.mk
@@ -12,12 +12,6 @@ LOCAL_MAKE:= \
PATH="$(LOCAL_CLANG_PATH):$(PWD)/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8/x86_64-linux/bin:$$PATH" \
$(PWD)/prebuilts/build-tools/linux-x86/bin/make

-.PHONY: vinput-manager
-vinput-manager:
- cd device/intel/civ/host/virtual-input-manager && $(LOCAL_MAKE)
- cp device/intel/civ/host/virtual-input-manager/vinput-manager $(PRODUCT_OUT)/scripts/
- cp device/intel/civ/host/virtual-input-manager/sendkey $(PRODUCT_OUT)/scripts/
-
.PHONY: em-host-utilities
em-host-utilities:
mkdir -p $(PRODUCT_OUT)/scripts/
@@ -32,4 +26,4 @@ ini-sample:
cp device/intel/civ/host/vm-manager/scripts/setup_civ_ini.sh $(PRODUCT_OUT)/scripts/setup_civ_ini.sh

.PHONY: host-pkg
-host-pkg: em-host-utilities vinput-manager ini-sample
+host-pkg: em-host-utilities ini-sample
--
2.40.1