Blacklist noto-emoji-compat-java and update artifact pattern for timestamporeo-dr1-dev

am: 44ad4e4376

Change-Id: Ib02215c808b6f16a6ec2b55194e5a8b2326df74b

1 files changed, 6 insertions, 5 deletions

diff --git a/update_current.py b/update_current.py
index f9c69051a..04154db64 100755
--- a/update_current.py
+++ b/update_current.py
@@ -58,10 +58,11 @@ blacklist_files = [
     'annotations.zip',
     'public.txt',
     'R.txt',
-    'AndroidManifest.xml'
+    'AndroidManifest.xml',
+    'noto-emoji-compat-java.jar'
 ]
 
-artifact_pattern = re.compile(r"^(.+?)-(\d+\.\d+\.\d+(?:-\w+\d+)?)\.(jar|aar)$")
+artifact_pattern = re.compile(r"^(.+?)-(\d+\.\d+\.\d+(?:-\w+\d+)?(?:-[\d.]+)*)\.(jar|aar)$")
 
 
 def touch(fname, times=None):
@@ -259,9 +260,9 @@ except subprocess.CalledProcessError:
 try:
     has_args = args.support or args.platform
 
-    if has_args and args.support:
+    if (has_args and args.support) or not has_args:
         update_support('support_library', args.buildId)
-    if has_args and args.platform:
+    if (has_args and args.platform) or not has_args:
         update_sdk_repo('sdk_phone_armv7-sdk_mac', args.buildId)
         update_system('sdk_phone_armv7-sdk_mac', args.buildId)
 
@@ -281,4 +282,4 @@ finally:
                 ['git', 'commit', '-m', 'COMMIT TO REVERT - RESET ME!!!'], stdout=bitbucket)
             subprocess.check_call(['git', 'reset', '--hard', 'HEAD~1'], stdout=bitbucket)
     except subprocess.CalledProcessError:
-        print >> sys.stderr, "ERROR: Failed cleaning up, manual cleanup required!!!"
\ No newline at end of file
+        print >> sys.stderr, "ERROR: Failed cleaning up, manual cleanup required!!!"