platform-api

Merge lp:~sergiusens/platform-api/config_h into lp:platform-api

  1. config_h
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 51
Merged at revision: 50
Proposed branch: lp:~sergiusens/platform-api/config_h
Merge into: lp:platform-api
Diff against target: 16 lines (+7/-0)
1 file modified
android/hybris/Android.mk (+7/-0)
To merge this branch: bzr merge lp:~sergiusens/platform-api/config_h
Reviewer Review Type Date Requested Status
Ricardo Salveti (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+158613@code.launchpad.net

Commit message

Adding rules to generate config.h from Android.mk

To post a comment you must log in.
lp:~sergiusens/platform-api/config_h updated
51. By Sergio Schvezov

Removing extra whitespace added

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/platform-api-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/9/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'android/hybris/Android.mk'
2--- android/hybris/Android.mk 2013-02-17 22:38:57 +0000
3+++ android/hybris/Android.mk 2013-04-12 13:36:27 +0000
4@@ -5,6 +5,13 @@
5
6 LOCAL_CFLAGS += -std=gnu++0x
7
8+CONFIG_H := $(UPAPI_PATH)/include/ubuntu/ui/config.h
9+$(CONFIG_H):
10+ echo "Generating config.h"
11+ sed $(UPAPI_PATH)/include/config.h.in -e 's/@USE_GLES@/1/g' > $@
12+
13+LOCAL_GENERATED_SOURCES := $(CONFIG_H)
14+
15 LOCAL_C_INCLUDES := \
16 $(UPAPI_PATH)/include
17

Subscribers

People subscribed via source and target branches