libevdev: Do not compile libevdev_hollow when emerging
libevdev_hollow should only be used when testing within chroot.
Link in-place/libevdev.so to libevdev_hollow. Tools dependent on
libevdev will link against libevdev but will use libevdev or
libevdev_hollow depending on if they compiled with -in-place or not.
BUG=chromium:1073988
TEST=Check
+ in ~/trunk/src/platform/touchpad-tests that
'sudo make setup-in-place && touchtests' passes.
+ emerge-eve libevdev does not compile libevdev_hollow.
Cq-Depend: chromium:2173446
Change-Id: I5f6d06ee78e05d152cc319d45aa6e69d6ea5af20
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/libevdev/+/2171880
Tested-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-by: Sean O'Brien <seobrien@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Harry Cutts <hcutts@chromium.org>
Commit-Queue: Gwendal Grignou <gwendal@chromium.org>
diff --git a/Makefile b/Makefile
index e04269f..6a59a7f 100644
--- a/Makefile
+++ b/Makefile
@@ -6,10 +6,10 @@
LIBDIR ?= /usr/lib
-all: CC_LIBRARY(src/libevdev.so.0) CC_LIBRARY(src/libevdev_hollow.so.0)
+all: CC_LIBRARY(src/libevdev.so.0)
clean: CLEAN(src/libevdev.so.0) CLEAN(src/libevdev_hollow.so.0)
install: install-lib install-header
in-place: CC_LIBRARY(src/libevdev_hollow.so.0)
clean-in-place: clean
-setup-in-place: setup-lib-in-place setup-header-in-place
\ No newline at end of file
+setup-in-place: setup-lib-in-place setup-header-in-place
diff --git a/src/module.mk b/src/module.mk
index 23135f0..63f9783 100644
--- a/src/module.mk
+++ b/src/module.mk
@@ -15,16 +15,13 @@
src/libevdev_mt.o \
src/libevdev_event.o
-install-lib: CC_LIBRARY(src/libevdev.so.0) CC_LIBRARY(src/libevdev_hollow.so.0)
+install-lib: CC_LIBRARY(src/libevdev.so.0)
install -D -m 0755 src/libevdev.so.0 $(DESTDIR)$(LIBDIR)/libevdev.so.0
ln -f -s libevdev.so.0 $(DESTDIR)$(LIBDIR)/libevdev.so
- install -D -m 0755 src/libevdev_hollow.so.0 \
- $(DESTDIR)$(LIBDIR)/libevdev_hollow.so.0
- ln -f -s libevdev_hollow.so.0 $(DESTDIR)$(LIBDIR)/libevdev_hollow.so
install -D -m 0644 $(SRC)/libevdev-cros.pc \
$(DESTDIR)$(LIBDIR)/pkgconfig/libevdev-cros.pc
setup-lib-in-place:
mkdir -p $(SRC)/in-place || true
- ln -sf $(SRC)/src/libevdev_hollow.so.0 $(SRC)/in-place/libevdev_hollow.so
- ln -sf $(SRC)/src/libevdev_hollow.so.0 $(SRC)/in-place/libevdev_hollow.so.0
+ ln -sf $(SRC)/src/libevdev_hollow.so.0 $(SRC)/in-place/libevdev.so
+ ln -sf $(SRC)/src/libevdev_hollow.so.0 $(SRC)/in-place/libevdev.so.0
