powerd

Merge lp:~rsalveti/powerd/using_pkg-config_updating_libhybris_dependency into lp:powerd

  1. using_pkg-config_updating_libhybris_dependency
  2. Merge into trunk
Proposed by Ricardo Salveti
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 104
Merged at revision: 104
Proposed branch: lp:~rsalveti/powerd/using_pkg-config_updating_libhybris_dependency
Merge into: lp:powerd
Diff against target: 55 lines (+9/-5)
2 files modified
CMakeLists.txt (+6/-3)
debian/control (+3/-2)
To merge this branch: bzr merge lp:~rsalveti/powerd/using_pkg-config_updating_libhybris_dependency
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+199160@code.launchpad.net

Commit message

Using pkg-config files from hybris, and depending on latest version

Description of the change

Using pkg-config files from hybris, and depending on latest version

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/powerd-ci/131/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/powerd-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/powerd-ci/131/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

Code looks good, tested on maguro just in case as well

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-10-09 05:08:55 +0000
3+++ CMakeLists.txt 2013-12-16 17:28:57 +0000
4@@ -18,6 +18,9 @@
5 set(GDBUS_NAME powerd-dbus)
6
7 find_package(PkgConfig)
8+pkg_check_modules(ANDROID_HEADERS android-headers)
9+pkg_check_modules(HYBRIS_IS libis)
10+pkg_check_modules(HYBRIS_SF libsf)
11 pkg_check_modules(GLIB glib-2.0)
12 pkg_check_modules(GIO gio-2.0)
13 pkg_check_modules(GIO-UNIX gio-unix-2.0)
14@@ -68,6 +71,7 @@
15 )
16
17 include_directories(
18+ ${ANDROID_HEADERS_INCLUDE_DIRS}
19 ${GLIB_INCLUDE_DIRS}
20 ${GIO_INCLUDE_DIRS}
21 ${GIO-UNIX_INCLUDE_DIRS}
22@@ -103,9 +107,8 @@
23 powerd
24 suspend
25
26- is
27- sf
28- hybris_ics
29+ ${HYBRIS_IS_LIBRARIES}
30+ ${HYBRIS_SF_LIBRARIES}
31 ${GLIB_LIBRARIES}
32 ${GIO_LIBRARIES}
33 ${GIO-UNIX_LIBRARIES}
34
35=== modified file 'debian/control'
36--- debian/control 2013-10-09 14:55:01 +0000
37+++ debian/control 2013-12-16 17:28:57 +0000
38@@ -5,14 +5,15 @@
39 Build-Depends: debhelper (>= 9),
40 cmake,
41 libglib2.0-dev,
42- libhybris-dev (>= 0.1.0+git20130606+c5d897a-0ubuntu28),
43+ android-headers (>= 4.2.2),
44+ libhybris-dev (>= 0.1.0+git20131206+0cdd7f2-0ubuntu1),
45 libudev-dev,
46 python,
47 libandroid-properties-dev,
48 libplatform-api1-dev,
49 libupower-glib-dev,
50 uuid-dev,
51- libhardware-dev (>= 0.1.0+git20130606+c5d897a-0ubuntu33),
52+ libhardware-dev (>= 0.1.0+git20131206+0cdd7f2-0ubuntu1),
53 Standards-Version: 3.9.4
54 Homepage: https://launchpad.net/powerd
55 # If you aren't a member of ~phablet-team but need to upload packaging changes,

Subscribers

People subscribed via source and target branches