Move aom source to a sub-directory under media/libaom

media/libaom/generate_sources_mozbuild.py

@@ -9,7 +9,7 @@ import os
 import re
 import subprocess
 
-AOM_DIR = '../../third_party/aom'
+AOM_DIR = '../../media/libaom/src'
 
 def write_aom_config(system, arch, variables, cache_variables):
     # read template cmake file

media/libaom/generate_sources_mozbuild.sh

@@ -15,7 +15,7 @@
 
 export LC_ALL=C
 BASE_DIR=$(pwd)
-LIBAOM_SRC_DIR="../../third_party/aom"
+LIBAOM_SRC_DIR="../../media/libaom/src"
 LIBAOM_CONFIG_DIR="config"
 
 # Print license header.

media/libaom/moz.build

@@ -134,10 +134,10 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
 ASFLAGS += CONFIG['VPX_ASFLAGS']
 ASFLAGS += [
     '-I.',
-    '-I%s/third_party/aom' % TOPSRCDIR,
+    '-I%s/media/libaom/src' % TOPSRCDIR,
 ]
 
 LOCAL_INCLUDES += [
     '/media/libaom/config', # aom_version.h
-    '/third_party/aom',
+    '/media/libaom/src',
 ]