summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/pull/148'HEADmasterEugen Friedrich2023-05-057-19/+118
|\ | | | | | | | | | | | | | | | | | | | | * upstream/pull/148 ilm_input_test: update tests with default seat ilmInput: support ilm_getDefaultSeat api to return default seat name ivi-input-modules: read default seat name from weston.ini file Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * ilm_input_test: update tests with default seatTran Ba Khang(MS/EMC31-XC)2023-04-281-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | Currently, tests are using the 'default' as the default seat name. In the case, the default seat name is not the 'default', tests will return a failure. ilm_getDefaultSeat is used to get the default seat name. If it returned ILM_SUCCESS, execute the tests with the seat name got from the API. Otherwise, skip the tests. Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
| * ilmInput: support ilm_getDefaultSeat api to return default seat nameTran Ba Khang(MS/EMC31-XC)2023-04-286-7/+53
| | | | | | | | | | | | | | | | | | | | | | | | Sometimes the client need to know the default seat is available or not, or it wants to know which seat is default among multi seats. The seat_create_event should add more an argument for identification of default seat. The ilm_getDefaultSeat is going to query the list of seats to find the default seat name. Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
| * ivi-input-modules: read default seat name from weston.ini fileTran Ba Khang(MS/EMC31-XC)2023-04-281-5/+46
| | | | | | | | | | | | | | | | | | | | | | Currently, the default seat name is "default". On weston 10, the wayland backend is using 'seat0' as the default seat name. This resulted in failing input examples and tests. To avoid this situation in the future, the default seat name should be configured in weston.ini file. Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
* | Merge remote-tracking branch 'upstream/pull/149'Eugen Friedrich2023-04-284-29/+240
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/149 tests: create tests for new screenshot functions with callbacks ilmControl: Extend screenshot API with callback support Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * | tests: create tests for new screenshot functions with callbacksTran Ba Khang(MS/EMC31-XC)2023-03-201-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two new screenshot async functions, it help to capture a screen or a surface without blocking. Write the notification test for them, make sure the done and error callback is trigged Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
| * | ilmControl: Extend screenshot API with callback supportMarek Vasut2023-03-203-29/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the screenshot API such that it permits user to add their own hooks into screenshot_done and screenshot_err callbacks. This way, the user can obtain the FD with the screenshot and process it instead of having the screenshot written into a file in /tmp directory. Make the filename optional, so the user can provide only the callbacks and skip writing the file into /tmp altogether. The library ABI is unaffected, the new functionality is added via two library functions, ilm_takeScreenshot5() and ilm_takeSurfaceScreenshot5(), which are now internally called by their original counterparts with callback hooks set to NULL. Signed-off-by: Marek Vasut <marex@denx.de> [khangtb: rename the name of functions, ilm_takeAsyncScreenshot() and ilm_takeAsyncSurfaceScreenshot(). Define typedef for notification callbacks. Correct the minor things. remove the filename input from the function, make the non-blocking] Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
* | | Merge remote-tracking branch 'upstream/pull/155'Eugen Friedrich2023-04-202-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/155 ivi-controller: update data type of member in struct ivishell Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Tran Ba Khang <khang.tranba@vn.bosch.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * | | ivi-controller: update data type of member in struct ivishellAu Doan Ngoc2023-04-062-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | From weston version 8.0.0, data type of param in weston_config_section_get_bool() changed from int to bool. So, we need to update in wayland-ivi-extension source. Signed-off-by: Au Doan Ngoc <au.doanngoc@vn.bosch.com>
* | | Merge remote-tracking branch 'upstream/pull/153'Eugen Friedrich2023-04-058-8/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | * upstream/pull/153 CMake: Specify generic library destination for installation Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com>
| * | CMake: Specify generic library destination for installationRajendraprasad K J2023-04-038-8/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libraries generated are now installed in lib${LIB_SUFFIX} (lib/lib32/lib64) directory. This doesn't work with Debian as it expects libraries to be present in lib/<multiarch-tuple>. Set the library destination path to 'CMAKE_INSTALL_LIBDIR'. Signed-off-by: Rajendraprasad K J <KarammelJayakumar.Rajendraprasad@in.bosch.com> [Khang: Weston installed its modules to dir_module_weston, then loading modules when run time. It's defined dir_lib/weston. Weston doesn't puclib the variable via pkgconfig. But we can get the dir_lib via WESTON_LIBDIR, then we can install the ivi-modules to that directory] Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
* | Merge remote-tracking branch 'upstream/pull/151'Eugen Friedrich2023-03-171-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | * upstream/pull/151 ivi-controller: Fix the problem of assigning an address to a pointer Reviewed-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com> Reviewed-by: Tran Ba Khang <khang.tranba@vn.bosch.com>
| * | ivi-controller: Fix the problem of assigning an address to a pointerAu Doan Ngoc2023-02-281-2/+2
| |/ | | | | | | | | | | | | In function controller_screen_get, iviscrn should be checked for null before assigning it to a pointer. Signed-off-by: Au Doan Ngoc <au.doanngoc@vn.bosch.com>
* | Merge remote-tracking branch 'upstream/pull/145'Eugen Friedrich2023-03-171-15/+51
|\ \ | |/ |/| | | | | | | | | | | | | | | * upstream/pull/145 simple-weston-client: Improve signal handling Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Tran Ba Khang <khang.tranba@vn.bosch.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Tran Ba Khang <khang.tranba@vn.bosch.com>
| * simple-weston-client: Improve signal handlingRajendraprasad K J2023-02-141-15/+51
| | | | | | | | | | | | | | | | | | | | Currently signal handling is not properly done while listening for events on wayland socket. As a result process waits on poll() for idefinite time even after receiving signal. Modify poll() to accept signals while listening to events on wayland socket. Signed-off-by: Rajendraprasad K J <KarammelJayakumar.Rajendraprasad@in.bosch.com>
* | Merge remote-tracking branch 'upstream/pull/142'Eugen Friedrich2023-02-102-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/142 CMakeLists: update libweston to version 9 Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * | CMakeLists: update libweston to version 9Tran Ba Khang(MS/EMC31-XC)2023-01-312-3/+3
| | | | | | | | | | | | | | | | | | | | | Update the libweston-9 on ivi-id-agent cmake file. Update the libweston-9-protocols on simple-weston-client cmake file. Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
* | | Merge remote-tracking branch 'upstream/pull/147'2.2.3_weston_8_compatibleEugen Friedrich2023-02-101-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | * upstream/pull/147 IlmControl: fix no warning in a function Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Tran Ba Khang <khang.tranba@vn.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * | IlmControl: fix no warning in a functionAuDoan2023-01-311-1/+1
| |/ | | | | | | | | | | | | | | In function input_listener_input_acceptance, variable "surface_found" should be initialized to 0. Only then "if(!surface_found)" will take effect. Signed-off-by: Au Doan Ngoc <au.doanngoc@vn.bosch.com>
* | Merge remote-tracking branch 'upstream/pull/125'Eugen Friedrich2023-01-202-4/+89
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/125 ivi-input-controller: ivi-controller: Copy over weston internal functions Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * | ivi-input-controller: ivi-controller: Copy over weston internal functionsMarek Vasut2022-01-232-4/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both ivi-controller and ivi-input-controller access functions which are internal to weston, which means the ABI of these functions may change or they may even be completely removed. So far, this wayland-ivi-extension was able to link against libweston and use those functions by sheer luck, but that may eventually run out. Copy over the internal functions as of weston commit 2c1ed289 ("build: bump to version 9.0.92 for the beta release") Signed-off-by: Marek Vasut <marex@denx.de>
* | | Merge remote-tracking branch 'upstream/pull/141'Eugen Friedrich2023-01-205-65/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/141 CMakeLists: update libweston to version 8 Remove unused function decodeEscapesequences Remove unused function importSceneFromTXTHelper Add missing include of endian.h Fix crash in controller_screenshot_notify Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * | | CMakeLists: update libweston to version 8Tran Ba Khang(MS/EMC31-XC)2023-01-132-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the libweston-8 on ivi-id-agent cmake file. Update the libweston-8-protocols on simple-weston-client cmake file Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
| * | | Remove unused function decodeEscapesequencesAlexander Irion2023-01-131-13/+0
| | | |
| * | | Remove unused function importSceneFromTXTHelperAlexander Irion2023-01-131-48/+0
| | | |
| * | | Add missing include of endian.hAlexander Irion2023-01-131-0/+1
| | | | | | | | | | | | | | | | htole32, htole16 needs endian.h to be included.
| * | | Fix crash in controller_screenshot_notifyAlexander Irion2023-01-131-1/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the following change in weston-8 the wl_signal_emit's data parameter has been changed from output to output_damge: https://github.com/wayland-project/weston/commit/0bb94476532ebbe95e255a9a736ee0c48866db53 has changed wl_signal_emit(&output->frame_signal, output); => wl_signal_emit(&output->frame_signal, output_damage); The function controller_screenshot_notify in ivi-controller.c interprets the data parameter as output, which causes winston to crash. With this chage, the output is now stored in the screenshot_frame_listener struct and controller_screenshot_notify uses the stored value, instead of the signal's data parameter.
* | | Merge remote-tracking branch 'upstream/pull/146'2.2.2_weston_7_compatibleEugen Friedrich2023-01-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/146 ivi-id-agent: Revert the weston header link Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * | | ivi-id-agent: Revert the weston header linkTran Ba Khang(MS/EMC31-XC)2023-01-091-1/+1
|/ / / | | | | | | | | | | | | | | | | | | The WESTON_INCLUDE_DIRS contains a link to ${install_dir}/include/weston. So, header files should not include the weston directory in the path. Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
* | | Merge remote-tracking branch 'upstream/pull/110'Eugen Friedrich2023-01-074-7/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/110 simple-weston-client: update dependencies to build on weston 7 ivi-id-agent: update dependencies to build on weston 7 ivi-id-agent: update to weston 7 header files ivi-input-controller: update to weston 7 header files Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com> solved merged onflicts: ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c
| * | | simple-weston-client: update dependencies to build on weston 7Rajendraprasad K J2020-01-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | upgrade libweston-protocols version. Signed-off-by: Rajendraprasad K J <KarammelJayakumar.Rajendraprasad@in.bosch.com>
| * | | ivi-id-agent: update dependencies to build on weston 7Rajendraprasad K J2020-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | upgrade libweston-desktop version. Signed-off-by: Rajendraprasad K J <KarammelJayakumar.Rajendraprasad@in.bosch.com>
| * | | ivi-id-agent: update to weston 7 header filesRajendraprasad K J2020-01-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | update the header file path. Signed-off-by: Rajendraprasad K J <KarammelJayakumar.Rajendraprasad@in.bosch.com>
| * | | ivi-input-controller: update to weston 7 header filesRajendraprasad K J2020-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | update the header file path. Signed-off-by: Rajendraprasad K J <KarammelJayakumar.Rajendraprasad@in.bosch.com>
* | | | Merge remote-tracking branch 'upstream/pull/140'2.2.1_weston_6_compatibleEugen Friedrich2023-01-071-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/140 README: update for wayland backend Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com>
| * | | | README: update for wayland backendTran Ba Khang(MS/EMC31-XC)2022-12-071-4/+8
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Ubuntu 22.04, the display controller are using the wayland protocols by default. Run a new weston process need to pass the wayland display socket listening. Clients want to run with new weston process need to set WAYLAND_DISPLAY environment variable. Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
* | | | Merge remote-tracking branch 'upstream/pull/139'Eugen Friedrich2023-01-073-26/+64
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/139 multi-touch-viewer: add the type of shell selection input Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * | | | multi-touch-viewer: add the type of shell selection inputTran Ba Khang(MS/EMC31-XC)2023-01-063-26/+64
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wl_shell and ivi_shell can’t create a surface base on a wl_surface at the same time, so a selection of shell before running the example is required. The ivi_shell is the shell default, passing the wl_shell follow by –s option to select wl_shell Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
* | | | Merge remote-tracking branch 'upstream/pull/138'Eugen Friedrich2023-01-071-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/138 ivi-id-agent: Fix invalid read reported by valgrind while stopping Weston Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * | | | ivi-id-agent: Fix invalid read reported by valgrind while stopping WestonRajendraprasad K J2022-12-051-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Valgrind reports the following issue while stopping Weston. ==2459== Invalid read of size 8 ==2459== at 0x7169040: deinit (ivi-id-agent.c:369) ==2459== by 0x488E98F: wl_signal_emit (wayland-server-core.h:394) ==2459== by 0x488E98F: weston_compositor_tear_down (compositor.c:7686) ==2459== by 0x40681F: main (main.c:3397) The elements of application list are not properly destroyed as it's link to the list exists even after deletion. Remove the element link using wl_list_remove() and use wl_list_for_each_safe() to safely iterate through the list. Signed-off-by: Rajendraprasad K J <KarammelJayakumar.Rajendraprasad@in.bosch.com>
* | | | Merge remote-tracking branch 'upstream/pull/136'Eugen Friedrich2023-01-071-9/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/136 EGLWLInputEventExample: fix crash when exit Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * | | | EGLWLInputEventExample: fix crash when exitTran Ba Khang(MS/EMC31-XC)2022-11-281-9/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The m_wlCursor is allocated on wl_cursor_theme_load, and free on wl_cursor_theme_destroy. The app don't need to manage this resource. Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
* | | | Merge remote-tracking branch 'upstream/pull/135'Eugen Friedrich2023-01-0711-16/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/135 ivi-id-agent-modules: missing linker directory include for libweston-desktop CMake: Fix weston header link CMake: correct the pkg_config header variable Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * | | | ivi-id-agent-modules: missing linker directory include for libweston-desktopTran Ba Khang(MS/EMC31-XC)2023-01-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user only build weston, the wayland and pixman are installed via apt, they will get the missing libweston-desktop header. Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
| * | | | CMake: Fix weston header linkTran Ba Khang(MS/EMC31-XC)2023-01-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WESTON_INCLUDE_DIRS contains a link to ${install_dir}/include/weston. So, header files should not include the weston directory in the path. Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
| * | | | CMake: correct the pkg_config header variableTran Ba Khang(MS/EMC31-XC)2023-01-037-13/+13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | pkg_check_modules will create the include directory variable of the module. The format is: ${MODULE}_INCLUDE_DIRS. Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
* | | | Merge remote-tracking branch 'upstream/pull/133'Eugen Friedrich2023-01-071-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/133 protocol: Link ivi-application library with wayland-client library Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * | | | protocol: Link ivi-application library with wayland-client libraryRajendraprasad K J2022-11-081-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ivi-application library uses wayland-client library symbol: aarch64-linux-gnu-objdump -TC libivi-application.so | grep wl_ 0000000000000000 D *UND* 0000000000000000 wl_surface_interface but couldn't observe it in the library's 'Dynamic Section': aarch64-linux-gnu-objdump -p libivi-application.so | grep NEEDED NEEDED libc.so.6 Link libivi-application.so with libwayland-client.so to prevent undefined symbol errors. Signed-off-by: Rajendraprasad K J <KarammelJayakumar.Rajendraprasad@in.bosch.com>
* | | | Merge remote-tracking branch 'upstream/pull/128'Eugen Friedrich2023-01-074-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pull/128 ilm: remove declaration of a global variable in a header file Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com> Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
| * | | | ilm: remove declaration of a global variable in a header fileJeka Friedrich2022-02-204-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes following error with the gcc 11.2.0: usr/bin/ld: CMakeFiles/ilmCommon.dir/src/ilm_common_wayland_platform.c.o:(.bss+0x0): multiple definition of `gIlmCommonPlatformFunc'; CMakeFiles/ilmCommon.dir/src/ilm_common.c.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status make[2]: *** [ivi-layermanagement-api/ilmCommon/CMakeFiles/ilmCommon.dir/build.make:119: ivi-layermanagement-api/ilmCommon/libilmCommon.so.2.2.0] Error 1 make[1]: *** [CMakeFiles/Makefile2:511: ivi-layermanagement-api/ilmCommon/CMakeFiles/ilmCommon.dir/all] Error 2 ilm_client and ilm_common both has the same issue. fix: move the declaration to the c file and define the variable as "external" in the header file Signed-off-by: Jeka Friedrich <friedrix@gmail.com>