-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'android-7.1.2_r2' into n7.1
Android 7.1.2 Release 2 (N2G47E) Change-Id: Ie3d3e9ea5c8dd67f44e43b2ed5a97e844c19888d
- Loading branch information
1 parent
16258a0
commit 83e8e73
Showing
18 changed files
with
439 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| ############################################################################# | ||
| ## Standard rules for installing runtime resouce overlay APKs. | ||
| ## | ||
| ## Set LOCAL_RRO_THEME to the theme name if the package should apply only to | ||
| ## a particular theme as set by ro.boot.vendor.overlay.theme system property. | ||
| ## | ||
| ## If LOCAL_RRO_THEME is not set, the package will apply always, independent | ||
| ## of themes. | ||
| ## | ||
| ############################################################################# | ||
|
|
||
| LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true | ||
|
|
||
| ifneq ($(LOCAL_SRC_FILES),) | ||
| $(error runtime resource overlay package should not contain sources) | ||
| endif | ||
|
|
||
| ifeq (S(LOCAL_RRO_THEME),) | ||
| LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/overlay | ||
| else | ||
| LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/overlay/$(LOCAL_RRO_THEME) | ||
| endif | ||
|
|
||
| include $(BUILD_SYSTEM)/package.mk | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| #!/usr/bin/env python | ||
| # | ||
| # Copyright (C) 2016 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. | ||
| # | ||
|
|
||
| import getopt, json, sys | ||
|
|
||
| def PrintFileNames(path): | ||
| with open(path) as jf: | ||
| data = json.load(jf) | ||
| for line in data: | ||
| print(line["Name"]) | ||
|
|
||
| def PrintCanonicalList(path): | ||
| with open(path) as jf: | ||
| data = json.load(jf) | ||
| for line in data: | ||
| print "{0:12d} {1}".format(line["Size"], line["Name"]) | ||
|
|
||
| def PrintUsage(name): | ||
| print(""" | ||
| Usage: %s -[nc] json_files_list | ||
| -n produces list of files only | ||
| -c produces classic installed-files.txt | ||
| """ % (name)) | ||
|
|
||
| def main(argv): | ||
| try: | ||
| opts, args = getopt.getopt(argv[1:], "nc", "") | ||
| except getopt.GetoptError, err: | ||
| print(err) | ||
| PrintUsage(argv[0]) | ||
| sys.exit(2) | ||
|
|
||
| if len(opts) == 0: | ||
| print("No conversion option specified") | ||
| PrintUsage(argv[0]) | ||
| sys.exit(2) | ||
|
|
||
| if len(args) == 0: | ||
| print("No input file specified") | ||
| PrintUsage(argv[0]) | ||
| sys.exit(2) | ||
|
|
||
| for o, a in opts: | ||
| if o == ("-n"): | ||
| PrintFileNames(args[0]) | ||
| sys.exit() | ||
| elif o == ("-c"): | ||
| PrintCanonicalList(args[0]) | ||
| sys.exit() | ||
| else: | ||
| assert False, "Unsupported option" | ||
|
|
||
| if __name__ == '__main__': | ||
| main(sys.argv) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.