PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updater_sample: Move to Soong.

Browse Source 
Test: Follow the steps in "Running tests" in updater_sample/README.md.
Change-Id: I70c3239e3daea0dcdadf02f68abe7d6aafa67a2e
This commit is contained in:
Tao Bao
2018-08-09 01:24:33 -07:00
parent 08cf9ccb2f
commit d2be7fc29a
6 changed files with 76 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.mk
View File

@@ -246,4 +246,3 @@ include \
$(LOCAL_PATH)/boot_control/Android.mk \
$(LOCAL_PATH)/tests/Android.mk \
$(LOCAL_PATH)/updater/Android.mk \
$(LOCAL_PATH)/updater_sample/Android.mk \

35
updater_sample/Android.bp Normal file
View File

@@ -0,0 +1,35 @@
// Copyright (C) 2018 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
android_app {
name: "SystemUpdaterSample",
sdk_version: "system_current",
privileged: true,
srcs: ["src/**/*.java"],
static_libs: [
"guava",
],
optimize: {
// TODO(b/112462307): proguard_flags_files is not picked up by Soong.
// proguard_flags_files: [
// "proguard.flags",
// ],
enabled: false,
},
resource_dirs: ["res"],
}

35
updater_sample/Android.mk
View File

@@ -1,35 +0,0 @@
#
# Copyright (C) 2018 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := SystemUpdaterSample
LOCAL_SDK_VERSION := system_current
LOCAL_PRIVILEGED_MODULE := true
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES += guava
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
include $(call all-makefiles-under,$(LOCAL_PATH))

2
updater_sample/README.md
View File

@@ -227,7 +227,7 @@ privileged system app, so it's granted the required permissions to access
1. Build `mmma bootable/recovery/updater_sample/`
2. Install app
`adb install $OUT/system/app/SystemUpdaterSample/SystemUpdaterSample.apk`
`adb install $OUT/system/priv-app/SystemUpdaterSample/SystemUpdaterSample.apk`
3. Install tests
`adb install $OUT/testcases/SystemUpdaterSampleTests/SystemUpdaterSampleTests.apk`
4. Run tests

40
updater_sample/tests/Android.bp Normal file
View File

@@ -0,0 +1,40 @@
// Copyright (C) 2018 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
android_test {
name: "SystemUpdaterSampleTests",
sdk_version: "system_current",
libs: [
"android.test.base.stubs",
"android.test.runner.stubs",
"SystemUpdaterSample",
],
static_libs: [
"android-support-test",
"mockito-target-minus-junit4",
"guava",
],
instrumentation_for: "com.example.android.systemupdatersample",
optimize: {
enabled: false,
},
resource_dirs: ["res"],
srcs: ["src/**/*.java"],
}

36
updater_sample/tests/Android.mk
View File

@@ -1,36 +0,0 @@
#
# Copyright (C) 2018 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := SystemUpdaterSampleTests
LOCAL_SDK_VERSION := system_current
LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := \
android.test.base.stubs \
android.test.runner.stubs
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test \
mockito-target-minus-junit4 \
guava
LOCAL_INSTRUMENTATION_FOR := SystemUpdaterSample
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_SRC_FILES := $(call all-java-files-under, src)
include $(BUILD_PACKAGE)