From d9d79efd135d5538b12241161c77cf619100ea5e Mon Sep 17 00:00:00 2001 From: Piotr Tworek Date: Tue, 3 Mar 2015 17:48:40 +0900 Subject: [PATCH] Migrate tizen battery API provider implementation to new dir structure Generic code, should be usable for both xwalk and EWK, move to chromium_impl. Change-Id: Ie912672308462056653ee7b85324843bd940bf16 Signed-off-by: Piotr Tworek --- tizen_src/chromium_impl/chromium_impl.gypi | 12 ++++++++++-- .../device/battery/battery_status_manager_tizen.cc | 2 +- .../device/battery/battery_status_manager_tizen.h | 0 tizen_src/chromium_impl/device/battery_tizen.gypi | 19 +++++++++++++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) rename tizen_src/{impl => chromium_impl}/device/battery/battery_status_manager_tizen.cc (99%) rename tizen_src/{impl => chromium_impl}/device/battery/battery_status_manager_tizen.h (100%) create mode 100644 tizen_src/chromium_impl/device/battery_tizen.gypi diff --git a/tizen_src/chromium_impl/chromium_impl.gypi b/tizen_src/chromium_impl/chromium_impl.gypi index 03fac88..c9fe484 100644 --- a/tizen_src/chromium_impl/chromium_impl.gypi +++ b/tizen_src/chromium_impl/chromium_impl.gypi @@ -12,10 +12,18 @@ ], 'conditions': [ + ['tizen_multimedia_support==1', { 'includes': [ 'media/media_efl.gypi', ], - }], - ], + }], # tizen_mumtimedia_support==1 + + ['building_for_tizen_mobile==1', { + 'includes': [ + 'device/battery_tizen.gypi', + ], + }], # building_for_tizen_mobile==1 + + ], # conditions } diff --git a/tizen_src/impl/device/battery/battery_status_manager_tizen.cc b/tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.cc similarity index 99% rename from tizen_src/impl/device/battery/battery_status_manager_tizen.cc rename to tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.cc index 2b1f4e4..b51b8e9 100644 --- a/tizen_src/impl/device/battery/battery_status_manager_tizen.cc +++ b/tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "battery_status_manager_tizen.h" +#include "device/battery/battery_status_manager_tizen.h" #include #include diff --git a/tizen_src/impl/device/battery/battery_status_manager_tizen.h b/tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.h similarity index 100% rename from tizen_src/impl/device/battery/battery_status_manager_tizen.h rename to tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.h diff --git a/tizen_src/chromium_impl/device/battery_tizen.gypi b/tizen_src/chromium_impl/device/battery_tizen.gypi new file mode 100644 index 0000000..3f2df1c --- /dev/null +++ b/tizen_src/chromium_impl/device/battery_tizen.gypi @@ -0,0 +1,19 @@ +# Copyright (c) 2015 Samsung Electronics. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'target_defaults': { + 'target_conditions': [ + ['_target_name=="device_battery"', { + 'sources/': [ + [ 'exclude', 'battery_status_manager_linux\\.(h|cc)$' ], + ], + 'sources': [ + 'battery/battery_status_manager_tizen.cc', + 'battery/battery_status_manager_tizen.h', + ], + }], + ], # target_conditions + }, # target_defaults +} -- 2.7.4