diff options
| author | Jay Sharma <jay.sharma@samsung.com> | 2015-05-20 20:12:15 +0530 |
|---|---|---|
| committer | Uze Choi <uzchoi@samsung.com> | 2015-05-20 15:02:40 +0000 |
| commit | c9f704c82ae7686bc6826d72e2f48b9ed12523d0 (patch) | |
| tree | ce649d3738900b4e8eca23adea2145779908adb2 /SConstruct | |
| parent | a16e6faa29c0bf20a2bf437a96a79acc1f44433a (diff) | |
| download | iotivity-c9f704c82ae7686bc6826d72e2f48b9ed12523d0.tar.gz iotivity-c9f704c82ae7686bc6826d72e2f48b9ed12523d0.tar.bz2 iotivity-c9f704c82ae7686bc6826d72e2f48b9ed12523d0.zip | |
Merging primitive services(TM, SSM and NM) from android-api branch.
Change-Id: Ic94647509c50a44265dca63509f0883e99173f59
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1036
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index eeaa86a8a..f02a54c19 100644 --- a/SConstruct +++ b/SConstruct @@ -55,7 +55,6 @@ if target_os not in ['arduino','darwin','ios', 'android']: SConscript(build_dir + 'examples/OICMiddle/SConscript') # Build 'service' sub-project -# if target_os != 'android': SConscript(build_dir + 'service/SConscript') # Append targets information to the help information, to see help info, execute command line: |