summaryrefslogtreecommitdiff
authorZhigang Yu <zhigang.yu@amlogic.com>2017-07-18 02:09:42 (GMT)
committer Zhigang Yu <zhigang.yu@amlogic.com>2017-07-18 02:26:53 (GMT)
commit8bbe6bec3252c4ac38d1b6c7f7fa329681177efe (patch)
treea3c09726652b3e6957b12f52c7c116df1ff763be
parentf79a642a187e8c5bfe6ed1431dcf5f94a5dab03e (diff)
downloadDig-ref-o-20171115.zip
Dig-ref-o-20171115.tar.gz
Dig-ref-o-20171115.tar.bz2
dig: fixed build error,add amlogic license [1/1]
PD# 146719 fixed add amlogic license build error Change-Id: Idc81949d4255bbd73bd6ec98b6ab8e7868cc1731
Diffstat
-rw-r--r--Android.mk12
-rw-r--r--AndroidManifest.xml3
-rw-r--r--res/layout/activity_reboot.xml3
-rw-r--r--res/layout/activity_restore_system.xml3
-rw-r--r--res/layout/activity_wipe.xml3
-rw-r--r--res/values-zh-rCN/strings.xml3
-rw-r--r--res/values/dimens.xml2
-rw-r--r--res/values/strings.xml3
-rw-r--r--res/values/styles.xml2
9 files changed, 22 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk
index cf1dccc..3ebe532 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,9 @@
-+# Copyright (c) 2014 Amlogic, Inc. All rights reserved.
-+#
-+# This source code is subject to the terms and conditions defined in the
-+# file 'LICENSE' which is part of this source code package.
-+#
-+# Description: makefile
+# Copyright (c) 2014 Amlogic, Inc. All rights reserved.
+#
+# This source code is subject to the terms and conditions defined in the
+# file 'LICENSE' which is part of this source code package.
+#
+# Description: makefile
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 645b7c8..6d62e10 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
<!--
Copyright (c) 2014 Amlogic, Inc. All rights reserved.
@@ -7,7 +9,6 @@
Description: manifest
-->
-<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.droidlogic.dig"
android:sharedUserId="android.uid.system"
diff --git a/res/layout/activity_reboot.xml b/res/layout/activity_reboot.xml
index d0aed43..37ad37e 100644
--- a/res/layout/activity_reboot.xml
+++ b/res/layout/activity_reboot.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
<!--
Copyright (c) 2014 Amlogic, Inc. All rights reserved.
@@ -7,7 +9,6 @@
Description: manifest
-->
-<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/activity_restore_system.xml b/res/layout/activity_restore_system.xml
index 9875c19..d64b7af 100644
--- a/res/layout/activity_restore_system.xml
+++ b/res/layout/activity_restore_system.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
<!--
Copyright (c) 2014 Amlogic, Inc. All rights reserved.
@@ -7,7 +9,6 @@
Description: manifest
-->
-<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/activity_wipe.xml b/res/layout/activity_wipe.xml
index 63b15de..0ce130c 100644
--- a/res/layout/activity_wipe.xml
+++ b/res/layout/activity_wipe.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
<!--
Copyright (c) 2014 Amlogic, Inc. All rights reserved.
@@ -7,7 +9,6 @@
Description: manifest
-->
-<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 06fb7af..75f78bd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
<!--
Copyright (c) 2014 Amlogic, Inc. All rights reserved.
@@ -7,7 +9,6 @@
Description: manifest
-->
-<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">数据完整性保护</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c39b58e..a888a88 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
<!--
Copyright (c) 2014 Amlogic, Inc. All rights reserved.
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cbf0ae1..010bb92 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
<!--
Copyright (c) 2014 Amlogic, Inc. All rights reserved.
@@ -7,7 +9,6 @@
Description: manifest
-->
-<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Data Integrity Guard</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 19fdcf5..3412d56 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
<!--
Copyright (c) 2014 Amlogic, Inc. All rights reserved.