Loading core/Makefile +2 −2 Original line number Diff line number Diff line Loading @@ -2940,9 +2940,9 @@ define build-superimage-target-args --metadata-slots $(if $(1),2,1) \ --device-size $(BOARD_SUPER_PARTITION_SIZE) \ $(foreach name,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \ --partition $(name)$(1):$$($(UUIDGEN) $(name)$(1)):readonly:$(if $(2),$(call read-size-of-partitions,$(name)),0) \ --partition $(name)$(1):readonly:$(if $(2),$(call read-size-of-partitions,$(name)),0) \ $(if $(2), --image $(name)$(1)=$(call images-for-partitions,$(name))) \ $(if $(1), --partition $(name)_b:$$($(UUIDGEN) $(name)_b):readonly:0) \ $(if $(1), --partition $(name)_b:readonly:0) \ ) endef Loading core/config.mk +0 −1 Original line number Diff line number Diff line Loading @@ -705,7 +705,6 @@ JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar FAT16COPY := build/make/tools/fat16copy.py CHECK_LINK_TYPE := build/make/tools/check_link_type.py UUIDGEN := build/make/tools/uuidgen.py LPMAKE := $(HOST_OUT_EXECUTABLES)/lpmake$(HOST_EXECUTABLE_SUFFIX) PROGUARD := external/proguard/bin/proguard.sh Loading tools/uuidgen.pydeleted 100755 → 0 +0 −29 Original line number Diff line number Diff line #!/usr/bin/env python # # Copyright 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. from __future__ import print_function import sys import uuid def uuidgen(name): return uuid.uuid5(uuid.uuid5(uuid.NAMESPACE_URL, "android.com"), name) if __name__ == "__main__": if len(sys.argv) < 2: print("Usage: uuidgen.py <name>") sys.exit(1) name = sys.argv[1] print(uuidgen(name)) Loading
core/Makefile +2 −2 Original line number Diff line number Diff line Loading @@ -2940,9 +2940,9 @@ define build-superimage-target-args --metadata-slots $(if $(1),2,1) \ --device-size $(BOARD_SUPER_PARTITION_SIZE) \ $(foreach name,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \ --partition $(name)$(1):$$($(UUIDGEN) $(name)$(1)):readonly:$(if $(2),$(call read-size-of-partitions,$(name)),0) \ --partition $(name)$(1):readonly:$(if $(2),$(call read-size-of-partitions,$(name)),0) \ $(if $(2), --image $(name)$(1)=$(call images-for-partitions,$(name))) \ $(if $(1), --partition $(name)_b:$$($(UUIDGEN) $(name)_b):readonly:0) \ $(if $(1), --partition $(name)_b:readonly:0) \ ) endef Loading
core/config.mk +0 −1 Original line number Diff line number Diff line Loading @@ -705,7 +705,6 @@ JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar FAT16COPY := build/make/tools/fat16copy.py CHECK_LINK_TYPE := build/make/tools/check_link_type.py UUIDGEN := build/make/tools/uuidgen.py LPMAKE := $(HOST_OUT_EXECUTABLES)/lpmake$(HOST_EXECUTABLE_SUFFIX) PROGUARD := external/proguard/bin/proguard.sh Loading
tools/uuidgen.pydeleted 100755 → 0 +0 −29 Original line number Diff line number Diff line #!/usr/bin/env python # # Copyright 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. from __future__ import print_function import sys import uuid def uuidgen(name): return uuid.uuid5(uuid.uuid5(uuid.NAMESPACE_URL, "android.com"), name) if __name__ == "__main__": if len(sys.argv) < 2: print("Usage: uuidgen.py <name>") sys.exit(1) name = sys.argv[1] print(uuidgen(name))